diff --git a/packages/open-api-gateway/README.md b/packages/open-api-gateway/README.md
index d7b3d003b..622a1b634 100644
--- a/packages/open-api-gateway/README.md
+++ b/packages/open-api-gateway/README.md
@@ -1311,9 +1311,41 @@ The Smithy-based projects are compatible with the [Smithy IntelliJ Plugin](https
 * Right-click on the `smithy/build.gradle` file in your Smithy API project
 * Select "Link Gradle Project"
 
+### Tagging Operations
+
+Operations can be grouped together into logical collections via tags. This can be achieved in Smithy with the `@tags` trait:
+
+```smithy
+@tags(["pets", "users"])
+operation PurchasePet {
+  ...
+}
+```
+
+Or in OpenAPI using the `tags` property:
+
+```yaml
+paths:
+  /pets/purchase:
+    post:
+      operationId: purchasePet
+      tags:
+        - pets
+        - users
+      ...
+```
+
+When multiple tags are used, the "first" tag is considered to be the API that the operation belongs to, so in the generated client, the above example operation would be included in the `PetsApi` client but not the `UsersApi` client.
+
+Multiple tags are still useful for documentation generation, for example `DocumentationFormat.HTML_REDOC` will group operations by tag in the side navigation bar.
+
+If you would like to introduce tags without breaking existing clients, we recommend first adding a tag named `default` to all operations.
+
+⚠️ __Important Note__: Smithy version 1.27.2 and below sorts tags in alphabetical order and so the "first" tag will be the earliest in the alphabet. Therefore, if using tags in Smithy, we currently recommend prefixing your desired first tag with an underscore (`_`). This will be rectified in the next Smithy release, where tag order from the `@tags` trait will be preserved.
+
 ### Breaking Changes
 
 * `v0.14.0` - see https://github.com/aws/aws-prototyping-sdk/pull/280
   * Moved smithy model files from `model` directory to `smithy/src/main/smithy` - please move these manually as part of upgrading to `0.14.0`, and delete your `model` directory when done.
   * Moved smithy gradle files from `smithy-build` directory to `smithy` - if you have added any dependencies to your `smithy-build/build.gradle` file you will need to copy them across into `smithy/build.gradle` (note dependencies in the new gradle file start with `implementation` rather than `smithy`).
-  * Deprecated `gradleWrapperPath` option on SmithApiGateway projects in favour of `ignoreGradleWrapper: false` - the gradle wrapper in `smithy` directory is always used (and generated automatically if not found). If you used a custom gradle wrapper, copy it into the `smithy` directory, set `ignoreGradleWrapper: false` and check it in to your repository.
\ No newline at end of file
+  * Deprecated `gradleWrapperPath` option on SmithApiGateway projects in favour of `ignoreGradleWrapper: false` - the gradle wrapper in `smithy` directory is always used (and generated automatically if not found). If you used a custom gradle wrapper, copy it into the `smithy` directory, set `ignoreGradleWrapper: false` and check it in to your repository.
diff --git a/packages/open-api-gateway/scripts/generators/docs/openapitools.json b/packages/open-api-gateway/scripts/generators/docs/openapitools.json
index 6bd00a46c..d0473cce3 100644
--- a/packages/open-api-gateway/scripts/generators/docs/openapitools.json
+++ b/packages/open-api-gateway/scripts/generators/docs/openapitools.json
@@ -2,7 +2,7 @@
   "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "6.0.0",
+    "version": "6.3.0",
     "storageDir": "~/.open-api-generator-cli"
   }
 }
\ No newline at end of file
diff --git a/packages/open-api-gateway/scripts/generators/generate b/packages/open-api-gateway/scripts/generators/generate
index 5cff6d61a..5e19d1456 100755
--- a/packages/open-api-gateway/scripts/generators/generate
+++ b/packages/open-api-gateway/scripts/generators/generate
@@ -8,6 +8,7 @@ output_path=''
 generator=''
 generator_dir=''
 additional_properties=''
+openapi_normalizer=''
 src_dir='src'
 while [[ "$#" -gt 0 ]]; do case $1 in
   --spec-path) spec_path="$2"; shift;;
@@ -15,6 +16,7 @@ while [[ "$#" -gt 0 ]]; do case $1 in
   --generator) generator="$2"; shift;;
   --generator-dir) generator_dir="$2"; shift;;
   --additional-properties) additional_properties="$2"; shift;;
+  --openapi-normalizer) openapi_normalizer="$2"; shift;;
   --src-dir) src_dir="$2"; shift;;
 esac; shift; done
 
@@ -52,6 +54,7 @@ run_command @openapitools/openapi-generator-cli generate \
   --template-dir templates \
   --config config.final.yaml \
   --additional-properties="$additional_properties" \
+  ${openapi_normalizer:+"--openapi-normalizer=$openapi_normalizer"} \
   --input-spec $spec_path \
   --output $output_path
 
diff --git a/packages/open-api-gateway/scripts/generators/java/openapitools.json b/packages/open-api-gateway/scripts/generators/java/openapitools.json
index e444fd206..d0473cce3 100644
--- a/packages/open-api-gateway/scripts/generators/java/openapitools.json
+++ b/packages/open-api-gateway/scripts/generators/java/openapitools.json
@@ -2,7 +2,7 @@
   "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "6.0.1",
+    "version": "6.3.0",
     "storageDir": "~/.open-api-generator-cli"
   }
 }
\ No newline at end of file
diff --git a/packages/open-api-gateway/scripts/generators/python/openapitools.json b/packages/open-api-gateway/scripts/generators/python/openapitools.json
index 0d7390267..d0473cce3 100644
--- a/packages/open-api-gateway/scripts/generators/python/openapitools.json
+++ b/packages/open-api-gateway/scripts/generators/python/openapitools.json
@@ -2,7 +2,7 @@
   "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "6.1.0",
+    "version": "6.3.0",
     "storageDir": "~/.open-api-generator-cli"
   }
 }
\ No newline at end of file
diff --git a/packages/open-api-gateway/scripts/generators/typescript/openapitools.json b/packages/open-api-gateway/scripts/generators/typescript/openapitools.json
index 6bd00a46c..d0473cce3 100644
--- a/packages/open-api-gateway/scripts/generators/typescript/openapitools.json
+++ b/packages/open-api-gateway/scripts/generators/typescript/openapitools.json
@@ -2,7 +2,7 @@
   "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "6.0.0",
+    "version": "6.3.0",
     "storageDir": "~/.open-api-generator-cli"
   }
 }
\ No newline at end of file
diff --git a/packages/open-api-gateway/src/project/codegen/components/generated-java-client-source-code.ts b/packages/open-api-gateway/src/project/codegen/components/generated-java-client-source-code.ts
index cdc41d8da..43f7ae318 100644
--- a/packages/open-api-gateway/src/project/codegen/components/generated-java-client-source-code.ts
+++ b/packages/open-api-gateway/src/project/codegen/components/generated-java-client-source-code.ts
@@ -71,6 +71,9 @@ export class GeneratedJavaClientSourceCode extends Component {
           ].join("\\ "),
         },
         srcDir: path.join("src", "main", "java", ...invokerPackage.split(".")),
+        normalizers: {
+          KEEP_ONLY_FIRST_TAG_IN_OPERATION: true,
+        },
       });
     }
   }
diff --git a/packages/open-api-gateway/src/project/codegen/components/generated-python-client-source-code.ts b/packages/open-api-gateway/src/project/codegen/components/generated-python-client-source-code.ts
index 0a2cbab77..59dc62051 100644
--- a/packages/open-api-gateway/src/project/codegen/components/generated-python-client-source-code.ts
+++ b/packages/open-api-gateway/src/project/codegen/components/generated-python-client-source-code.ts
@@ -47,7 +47,7 @@ export class GeneratedPythonClientSourceCode extends Component {
       // Generate the python client
       logger.debug("Generating python client...");
       invokeOpenApiGenerator({
-        generator: "python-experimental",
+        generator: "python",
         specPath: this.options.specPath,
         outputPath: this.project.outdir,
         generatorDirectory: ClientLanguage.PYTHON,
@@ -57,6 +57,9 @@ export class GeneratedPythonClientSourceCode extends Component {
         },
         // Tell the generator where python source files live
         srcDir: (this.project as PythonProject).moduleName,
+        normalizers: {
+          KEEP_ONLY_FIRST_TAG_IN_OPERATION: true,
+        },
       });
     }
   }
diff --git a/packages/open-api-gateway/src/project/codegen/components/generated-typescript-client-source-code.ts b/packages/open-api-gateway/src/project/codegen/components/generated-typescript-client-source-code.ts
index 2155ec61f..841cf28ac 100644
--- a/packages/open-api-gateway/src/project/codegen/components/generated-typescript-client-source-code.ts
+++ b/packages/open-api-gateway/src/project/codegen/components/generated-typescript-client-source-code.ts
@@ -60,6 +60,9 @@ export class GeneratedTypescriptClientSourceCode extends Component {
           supportsES6: "true",
         },
         srcDir: (this.project as TypeScriptProject).srcdir,
+        normalizers: {
+          KEEP_ONLY_FIRST_TAG_IN_OPERATION: true,
+        },
       });
 
       // Write an index.ts which exposes the additional generated file OperationConfig.ts, which contains handler wrappers
diff --git a/packages/open-api-gateway/src/project/codegen/components/utils.ts b/packages/open-api-gateway/src/project/codegen/components/utils.ts
index 2783cadf6..14f8da666 100644
--- a/packages/open-api-gateway/src/project/codegen/components/utils.ts
+++ b/packages/open-api-gateway/src/project/codegen/components/utils.ts
@@ -17,6 +17,12 @@ export enum NonClientGeneratorDirectory {
  */
 export type GeneratorDirectory = ClientLanguage | NonClientGeneratorDirectory;
 
+/**
+ * Types of normalizers supported by openapi-generator
+ * @see https://openapi-generator.tech/docs/customization/#openapi-normalizer
+ */
+export type OpenApiNormalizer = "KEEP_ONLY_FIRST_TAG_IN_OPERATION";
+
 /**
  * Options for generating client code or docs using OpenAPI Generator CLI
  */
@@ -48,6 +54,11 @@ export interface GenerationOptions {
    * (eg. operation config) should be placed.
    */
   readonly srcDir?: string;
+  /**
+   * Normalizers to apply to the spec prior to generation, if any
+   * @see https://openapi-generator.tech/docs/customization/#openapi-normalizer
+   */
+  readonly normalizers?: Partial<Record<OpenApiNormalizer, boolean>>;
 }
 
 const serializeProperties = (properties: { [key: string]: string }) =>
@@ -95,8 +106,17 @@ export const invokeOpenApiGenerator = (options: GenerationOptions) => {
         options.additionalProperties
       )}"`
     : "";
+
+  const normalizers = options.normalizers
+    ? ` --openapi-normalizer "${serializeProperties(
+        Object.fromEntries(
+          Object.entries(options.normalizers).map(([k, v]) => [k, `${v}`])
+        )
+      )}"`
+    : "";
+
   exec(
-    `./generate --generator ${options.generator} --spec-path ${options.specPath} --output-path ${options.outputPath} --generator-dir ${options.generatorDirectory} --src-dir ${srcDir}${additionalProperties}`,
+    `./generate --generator ${options.generator} --spec-path ${options.specPath} --output-path ${options.outputPath} --generator-dir ${options.generatorDirectory} --src-dir ${srcDir}${additionalProperties}${normalizers}`,
     {
       cwd: path.resolve(
         __dirname,
diff --git a/packages/open-api-gateway/src/project/codegen/generated-java-client-project.ts b/packages/open-api-gateway/src/project/codegen/generated-java-client-project.ts
index 8c003f70d..613a4ef11 100644
--- a/packages/open-api-gateway/src/project/codegen/generated-java-client-project.ts
+++ b/packages/open-api-gateway/src/project/codegen/generated-java-client-project.ts
@@ -22,15 +22,15 @@ export interface GeneratedJavaClientProjectOptions extends JavaProjectOptions {
 
 const DEPENDENCIES: string[] = [
   // Required for open api generated client
-  "io.swagger/swagger-annotations@1.6.5",
+  "io.swagger/swagger-annotations@1.6.8",
   "com.google.code.findbugs/jsr305@3.0.2",
-  "com.squareup.okhttp3/okhttp@4.9.3",
-  "com.squareup.okhttp3/logging-interceptor@4.9.3",
-  "com.google.code.gson/gson@2.9.0",
+  "com.squareup.okhttp3/okhttp@4.10.0",
+  "com.squareup.okhttp3/logging-interceptor@4.10.0",
+  "com.google.code.gson/gson@2.9.1",
   "io.gsonfire/gson-fire@1.8.5",
   "org.apache.commons/commons-lang3@3.12.0",
   "jakarta.annotation/jakarta.annotation-api@1.3.5",
-  "org.openapitools/jackson-databind-nullable@0.2.2",
+  "org.openapitools/jackson-databind-nullable@0.2.4",
   "javax.ws.rs/jsr311-api@1.1.1",
   "javax.ws.rs/javax.ws.rs-api@2.1.1",
   // For handler wrappers
@@ -41,7 +41,7 @@ const DEPENDENCIES: string[] = [
 ];
 
 const TEST_DEPENDENCIES: string[] = [
-  "org.junit.jupiter/junit-jupiter-api@5.8.2",
+  "org.junit.jupiter/junit-jupiter-api@5.9.1",
   "org.mockito/mockito-core@3.12.4",
 ];
 
diff --git a/packages/open-api-gateway/src/project/spec/components/parsed-spec.ts b/packages/open-api-gateway/src/project/spec/components/parsed-spec.ts
index 68463944f..37136f664 100644
--- a/packages/open-api-gateway/src/project/spec/components/parsed-spec.ts
+++ b/packages/open-api-gateway/src/project/spec/components/parsed-spec.ts
@@ -1,10 +1,13 @@
 /*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0 */
 import * as path from "path";
+import { getLogger } from "log4js";
 import type { OpenAPIV3 } from "openapi-types";
 import { Component, Project } from "projen";
 import { exec, tryReadFileSync } from "projen/lib/util";
 
+const logger = getLogger();
+
 /**
  * Configuration for the ParsedSpec component
  */
@@ -62,9 +65,10 @@ export class ParsedSpec extends Component {
 
     const parsedSpec: OpenAPIV3.Document = JSON.parse(singleSpecFile);
 
-    // TODO: Remove this validation and update mustache templates as appropriate when the following has been addressed:
-    // https://github.com/OpenAPITools/openapi-generator/pull/14568
-    // Check that each operation has zero or one tags
+    // To avoid duplicating custom generated code (eg. OperationConfig or handler wrappers) and causing build errors, we
+    // will apply the OpenAPI Normalizer to KEEP_ONLY_FIRST_TAG_IN_OPERATION when generating code. Tags are still
+    // preserved in the specification to allow for better documentation.
+    // See: https://github.com/OpenAPITools/openapi-generator/pull/14465
     const operationsWithMultipleTags = Object.entries(parsedSpec.paths).flatMap(
       ([urlPath, methods]) =>
         Object.entries(methods ?? {})
@@ -79,10 +83,10 @@ export class ParsedSpec extends Component {
     );
 
     if (operationsWithMultipleTags.length > 0) {
-      throw new Error(
-        `Operations with multiple tags are not yet supported, please tag operations with at most one tag. The following operations have multiple tags: ${operationsWithMultipleTags.join(
+      logger.warn(
+        `The following operations had multiple tags: ${operationsWithMultipleTags.join(
           ", "
-        )}`
+        )}. Code will only be generated for each operation's first tag.`
       );
     }
   }
diff --git a/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-java-client-source-code.test.ts.snap b/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-java-client-source-code.test.ts.snap
index 02b77e9b6..3711adb19 100644
--- a/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-java-client-source-code.test.ts.snap
+++ b/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-java-client-source-code.test.ts.snap
@@ -173,7 +173,7 @@ src/test/java/test/test/client/model/TestRequestTest.java
 src/test/java/test/test/client/model/TestResponseMessagesInnerTest.java
 src/test/java/test/test/client/model/TestResponseTest.java
 ",
-  ".openapi-generator/VERSION": "6.0.1",
+  ".openapi-generator/VERSION": "6.3.0",
   ".projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -645,19 +645,11 @@ components:
       - errorMessage
       type: object
     TestRequest:
-      example:
-        myInput: 0.8008281904610115
       properties:
         myInput:
           type: number
       type: object
     TestResponse:
-      example:
-        messages:
-        - id: 0
-          message: message
-        - id: 0
-          message: message
       properties:
         messages:
           items:
@@ -667,9 +659,6 @@ components:
       - messages
       type: object
     TestResponse_messages_inner:
-      example:
-        id: 0
-        message: message
       properties:
         message:
           type: string
@@ -695,7 +684,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -747,7 +736,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -788,20 +777,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -861,19 +850,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -2000,7 +1990,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -2043,6 +2033,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -2059,7 +2050,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -2073,7 +2064,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>add_sources</id>
@@ -2104,7 +2095,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -2127,7 +2118,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -2207,11 +2198,6 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>\${swagger-core-version}</version>
-        </dependency>
         <!-- @Nullable annotation -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -2254,6 +2240,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <artifactId>jackson-databind-nullable</artifactId>
             <version>\${jackson-databind-nullable-version}</version>
         </dependency>
+
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
@@ -2289,19 +2276,19 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <maven.compiler.source>\${java.version}</maven.compiler.source>
         <maven.compiler.target>\${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.5</gson-fire-version>
-        <swagger-core-version>1.6.5</swagger-core-version>
-        <okhttp-version>4.9.3</okhttp-version>
-        <gson-version>2.9.0</gson-version>
+        <swagger-annotations-version>1.6.6</swagger-annotations-version>
+        <okhttp-version>4.10.0</okhttp-version>
+        <gson-version>2.9.1</gson-version>
         <commons-lang3-version>3.12.0</commons-lang3-version>
-        <jackson-databind-nullable-version>0.2.3</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.8.2</junit-version>
-        <junit-platform-runner.version>1.6.2</junit-platform-runner.version>
+        <junit-version>5.9.1</junit-version>
+        <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
         <mockito-core-version>3.12.4</mockito-core-version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spotless.version>2.21.0</spotless.version>
+        <spotless.version>2.27.2</spotless.version>
     </properties>
 </project>
 ",
@@ -2443,6 +2430,15 @@ import test.test.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -2536,6 +2532,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -2660,7 +2683,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -2671,7 +2694,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -2682,7 +2705,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -2693,7 +2716,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -2704,7 +2727,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -2797,6 +2820,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -2965,7 +3000,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -2973,7 +3008,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -3224,7 +3259,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -3258,11 +3293,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -3553,7 +3590,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -3682,11 +3730,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -3720,6 +3769,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -3787,7 +3861,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -3820,7 +3894,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws test.test.client.ApiException If fail to serialize the request body object into a string
      */
@@ -3941,7 +4015,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -4862,7 +4936,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -5080,7 +5154,7 @@ public class DefaultApi {
 
         // create path and map variables
         String localVarPath = \\"/operation/{pathParam}\\"
-            .replaceAll(\\"\\\\\\\\{\\" + \\"pathParam\\" + \\"\\\\\\\\}\\", localVarApiClient.escapeString(pathParam.toString()));
+            .replace(\\"{\\" + \\"pathParam\\" + \\"}\\", localVarApiClient.escapeString(pathParam.toString()));
 
         List<Pair> localVarQueryParams = new ArrayList<Pair>();
         List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
@@ -5110,20 +5184,17 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call someTestOperationValidateBeforeCall(String pathParam, TestRequest testRequest, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'pathParam' is set
         if (pathParam == null) {
             throw new ApiException(\\"Missing the required parameter 'pathParam' when calling someTestOperation(Async)\\");
         }
-        
+
         // verify the required parameter 'testRequest' is set
         if (testRequest == null) {
             throw new ApiException(\\"Missing the required parameter 'testRequest' when calling someTestOperation(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = someTestOperationCall(pathParam, testRequest, _callback);
-        return localVarCall;
+        return someTestOperationCall(pathParam, testRequest, _callback);
 
     }
 
@@ -6267,8 +6338,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -6285,6 +6354,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -6301,7 +6371,7 @@ public class ApiError {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiError() { 
+  public ApiError() {
   }
 
   public ApiError errorMessage(String errorMessage) {
@@ -6315,7 +6385,6 @@ public class ApiError {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -6387,9 +6456,7 @@ public class ApiError {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiError.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiError.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiError is not found in the empty JSON string\\", ApiError.openapiRequiredFields.toString()));
         }
       }
@@ -6408,7 +6475,7 @@ public class ApiError {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -6486,8 +6553,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import java.math.BigDecimal;
 
@@ -6505,6 +6570,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -6521,7 +6587,7 @@ public class TestRequest {
   @SerializedName(SERIALIZED_NAME_MY_INPUT)
   private BigDecimal myInput;
 
-  public TestRequest() { 
+  public TestRequest() {
   }
 
   public TestRequest myInput(BigDecimal myInput) {
@@ -6535,7 +6601,6 @@ public class TestRequest {
    * @return myInput
   **/
   @javax.annotation.Nullable
-  @ApiModelProperty(value = \\"\\")
 
   public BigDecimal getMyInput() {
     return myInput;
@@ -6606,9 +6671,7 @@ public class TestRequest {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (TestRequest.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!TestRequest.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in TestRequest is not found in the empty JSON string\\", TestRequest.openapiRequiredFields.toString()));
         }
       }
@@ -6695,8 +6758,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -6716,6 +6777,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -6732,7 +6794,7 @@ public class TestResponse {
   @SerializedName(SERIALIZED_NAME_MESSAGES)
   private List<TestResponseMessagesInner> messages = new ArrayList<>();
 
-  public TestResponse() { 
+  public TestResponse() {
   }
 
   public TestResponse messages(List<TestResponseMessagesInner> messages) {
@@ -6751,7 +6813,6 @@ public class TestResponse {
    * @return messages
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public List<TestResponseMessagesInner> getMessages() {
     return messages;
@@ -6823,9 +6884,7 @@ public class TestResponse {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (TestResponse.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!TestResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in TestResponse is not found in the empty JSON string\\", TestResponse.openapiRequiredFields.toString()));
         }
       }
@@ -6844,18 +6903,16 @@ public class TestResponse {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      JsonArray jsonArraymessages = jsonObj.getAsJsonArray(\\"messages\\");
-      if (jsonArraymessages != null) {
-        // ensure the json data is an array
-        if (!jsonObj.get(\\"messages\\").isJsonArray()) {
-          throw new IllegalArgumentException(String.format(\\"Expected the field \`messages\` to be an array in the JSON string but got \`%s\`\\", jsonObj.get(\\"messages\\").toString()));
-        }
-
-        // validate the optional field \`messages\` (array)
-        for (int i = 0; i < jsonArraymessages.size(); i++) {
-          TestResponseMessagesInner.validateJsonObject(jsonArraymessages.get(i).getAsJsonObject());
-        };
+      // ensure the json data is an array
+      if (!jsonObj.get(\\"messages\\").isJsonArray()) {
+        throw new IllegalArgumentException(String.format(\\"Expected the field \`messages\` to be an array in the JSON string but got \`%s\`\\", jsonObj.get(\\"messages\\").toString()));
       }
+
+      JsonArray jsonArraymessages = jsonObj.getAsJsonArray(\\"messages\\");
+      // validate the required field \`messages\` (array)
+      for (int i = 0; i < jsonArraymessages.size(); i++) {
+        TestResponseMessagesInner.validateJsonObject(jsonArraymessages.get(i).getAsJsonObject());
+      };
   }
 
   public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
@@ -6931,8 +6988,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -6949,6 +7004,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -6969,7 +7025,7 @@ public class TestResponseMessagesInner {
   @SerializedName(SERIALIZED_NAME_ID)
   private Integer id;
 
-  public TestResponseMessagesInner() { 
+  public TestResponseMessagesInner() {
   }
 
   public TestResponseMessagesInner message(String message) {
@@ -6983,7 +7039,6 @@ public class TestResponseMessagesInner {
    * @return message
   **/
   @javax.annotation.Nullable
-  @ApiModelProperty(value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -7006,7 +7061,6 @@ public class TestResponseMessagesInner {
    * @return id
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public Integer getId() {
     return id;
@@ -7081,9 +7135,7 @@ public class TestResponseMessagesInner {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (TestResponseMessagesInner.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!TestResponseMessagesInner.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in TestResponseMessagesInner is not found in the empty JSON string\\", TestResponseMessagesInner.openapiRequiredFields.toString()));
         }
       }
@@ -7102,7 +7154,7 @@ public class TestResponseMessagesInner {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if ((jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonNull()) && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -7237,8 +7289,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7268,8 +7318,7759 @@ public class ApiErrorTest {
 
 }
 ",
-  "src/test/java/test/test/client/model/TestRequestTest.java": "/*
- * Example API
+  "src/test/java/test/test/client/model/TestRequestTest.java": "/*
+ * Example API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.math.BigDecimal;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+
+/**
+ * Model tests for TestRequest
+ */
+public class TestRequestTest {
+    private final TestRequest model = new TestRequest();
+
+    /**
+     * Model tests for TestRequest
+     */
+    @Test
+    public void testTestRequest() {
+        // TODO: test TestRequest
+    }
+
+    /**
+     * Test the property 'myInput'
+     */
+    @Test
+    public void myInputTest() {
+        // TODO: test myInput
+    }
+
+}
+",
+  "src/test/java/test/test/client/model/TestResponseMessagesInnerTest.java": "/*
+ * Example API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+
+/**
+ * Model tests for TestResponseMessagesInner
+ */
+public class TestResponseMessagesInnerTest {
+    private final TestResponseMessagesInner model = new TestResponseMessagesInner();
+
+    /**
+     * Model tests for TestResponseMessagesInner
+     */
+    @Test
+    public void testTestResponseMessagesInner() {
+        // TODO: test TestResponseMessagesInner
+    }
+
+    /**
+     * Test the property 'message'
+     */
+    @Test
+    public void messageTest() {
+        // TODO: test message
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+}
+",
+  "src/test/java/test/test/client/model/TestResponseTest.java": "/*
+ * Example API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import test.test.client.model.TestResponseMessagesInner;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+
+/**
+ * Model tests for TestResponse
+ */
+public class TestResponseTest {
+    private final TestResponse model = new TestResponse();
+
+    /**
+     * Model tests for TestResponse
+     */
+    @Test
+    public void testTestResponse() {
+        // TODO: test TestResponse
+    }
+
+    /**
+     * Test the property 'messages'
+     */
+    @Test
+    public void messagesTest() {
+        // TODO: test messages
+    }
+
+}
+",
+}
+`;
+
+exports[`Generated Java Client Code Unit Tests Multiple Tags 1`] = `
+Object {
+  ".gitattributes": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+
+/.gitattributes linguist-generated
+/.github/workflows/pull-request-lint.yml linguist-generated
+/.gitignore linguist-generated
+/.projen/** linguist-generated
+/.projen/deps.json linguist-generated
+/.projen/files.json linguist-generated
+/.projen/tasks.json linguist-generated
+/pom.xml linguist-generated",
+  ".github/workflows/maven.yml": "# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+#
+# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+
+jobs:
+  build:
+    name: Build Multiple Tags Test
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '8' ]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK
+      uses: actions/setup-java@v2
+      with:
+        java-version: \${{ matrix.java }}
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --no-transfer-progress --file pom.xml
+",
+  ".github/workflows/pull-request-lint.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+
+name: pull-request-lint
+on:
+  pull_request_target:
+    types:
+      - labeled
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+      - edited
+jobs:
+  validate:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5.0.2
+        env:
+          GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }}
+        with:
+          types: |-
+            feat
+            fix
+            chore
+          requireScope: false
+",
+  ".gitignore": "*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# exclude jar for gradle wrapper
+!gradle/wrapper/*.jar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# build files
+**/target
+target
+.gradle
+build
+",
+  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
+",
+  ".openapi-generator/FILES": ".github/workflows/maven.yml
+.gitignore
+.openapi-generator-ignore
+.travis.yml
+README.md
+api/openapi.yaml
+build.gradle
+build.sbt
+docs/DefaultApi.md
+docs/Tag1Api.md
+docs/Tag2Api.md
+git_push.sh
+gradle.properties
+gradle/wrapper/gradle-wrapper.jar
+gradle/wrapper/gradle-wrapper.properties
+gradlew
+gradlew.bat
+pom.xml
+settings.gradle
+src/main/AndroidManifest.xml
+src/main/java/test/test/client/ApiCallback.java
+src/main/java/test/test/client/ApiClient.java
+src/main/java/test/test/client/ApiException.java
+src/main/java/test/test/client/ApiResponse.java
+src/main/java/test/test/client/Configuration.java
+src/main/java/test/test/client/GzipRequestInterceptor.java
+src/main/java/test/test/client/JSON.java
+src/main/java/test/test/client/Pair.java
+src/main/java/test/test/client/ProgressRequestBody.java
+src/main/java/test/test/client/ProgressResponseBody.java
+src/main/java/test/test/client/ServerConfiguration.java
+src/main/java/test/test/client/ServerVariable.java
+src/main/java/test/test/client/StringUtil.java
+src/main/java/test/test/client/api/DefaultApi.java
+src/main/java/test/test/client/api/DefaultApi/Handlers.java
+src/main/java/test/test/client/api/DefaultApi/OperationConfig.java
+src/main/java/test/test/client/api/DefaultApi/OperationLookup.java
+src/main/java/test/test/client/api/DefaultApi/Operations.java
+src/main/java/test/test/client/api/Tag1Api.java
+src/main/java/test/test/client/api/Tag2Api.java
+src/main/java/test/test/client/auth/ApiKeyAuth.java
+src/main/java/test/test/client/auth/Authentication.java
+src/main/java/test/test/client/auth/HttpBasicAuth.java
+src/main/java/test/test/client/auth/HttpBearerAuth.java
+src/main/java/test/test/client/model/AbstractOpenApiSchema.java
+src/test/java/test/test/client/api/DefaultApiTest.java
+src/test/java/test/test/client/api/Tag1ApiTest.java
+src/test/java/test/test/client/api/Tag2ApiTest.java
+",
+  ".openapi-generator/VERSION": "6.3.0",
+  ".projen/deps.json": Object {
+    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
+    "dependencies": Array [
+      Object {
+        "metadata": Object {
+          "configuration": Object {
+            "source": "1.8",
+            "target": "1.8",
+          },
+        },
+        "name": "org.apache.maven.plugins/maven-compiler-plugin",
+        "type": "build",
+        "version": "3.8.1",
+      },
+      Object {
+        "metadata": Object {
+          "configuration": Object {
+            "rules": Array [
+              Object {
+                "requireMavenVersion": Array [
+                  Object {
+                    "version": "3.6",
+                  },
+                ],
+              },
+            ],
+          },
+          "executions": Array [
+            Object {
+              "goals": Array [
+                "enforce",
+              ],
+              "id": "enforce-maven",
+            },
+          ],
+        },
+        "name": "org.apache.maven.plugins/maven-enforcer-plugin",
+        "type": "build",
+        "version": "3.0.0-M3",
+      },
+      Object {
+        "metadata": Object {
+          "configuration": Object {
+            "archive": Object {
+              "index": true,
+              "manifest": Object {
+                "addDefaultImplementationEntries": true,
+                "addDefaultSpecificationEntries": true,
+              },
+            },
+          },
+        },
+        "name": "org.apache.maven.plugins/maven-jar-plugin",
+        "type": "build",
+        "version": "3.2.0",
+      },
+      Object {
+        "metadata": Object {
+          "configuration": Object {
+            "additionalJOptions": Object {
+              "additionalJOption": Array [
+                "-J-XX:+TieredCompilation",
+                "-J-XX:TieredStopAtLevel=1",
+              ],
+            },
+            "detectJavaApiLink": false,
+            "failOnError": false,
+            "show": "protected",
+          },
+          "executions": Array [
+            Object {
+              "goals": Array [
+                "jar",
+              ],
+              "id": "attach-javadocs",
+            },
+          ],
+        },
+        "name": "org.apache.maven.plugins/maven-javadoc-plugin",
+        "type": "build",
+        "version": "3.2.0",
+      },
+      Object {
+        "metadata": Object {
+          "executions": Array [
+            Object {
+              "goals": Array [
+                "jar",
+              ],
+              "id": "attach-sources",
+            },
+          ],
+        },
+        "name": "org.apache.maven.plugins/maven-source-plugin",
+        "type": "build",
+        "version": "3.2.1",
+      },
+      Object {
+        "name": "org.codehaus.mojo/exec-maven-plugin",
+        "type": "build",
+        "version": "3.0.0",
+      },
+      Object {
+        "name": "io.github.cdklabs/projen",
+        "type": "test",
+        "version": "99.99.99",
+      },
+      Object {
+        "name": "org.junit.jupiter/junit-jupiter-api",
+        "type": "test",
+        "version": "5.7.0",
+      },
+      Object {
+        "name": "org.junit.jupiter/junit-jupiter-engine",
+        "type": "test",
+        "version": "5.7.0",
+      },
+    ],
+  },
+  ".projen/files.json": Object {
+    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
+    "files": Array [
+      ".gitattributes",
+      ".github/workflows/pull-request-lint.yml",
+      ".gitignore",
+      ".projen/deps.json",
+      ".projen/files.json",
+      ".projen/tasks.json",
+      "pom.xml",
+    ],
+  },
+  ".projen/tasks.json": Object {
+    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
+    "tasks": Object {
+      "build": Object {
+        "description": "Full release build",
+        "name": "build",
+        "steps": Array [
+          Object {
+            "spawn": "default",
+          },
+          Object {
+            "spawn": "pre-compile",
+          },
+          Object {
+            "spawn": "compile",
+          },
+          Object {
+            "spawn": "post-compile",
+          },
+          Object {
+            "spawn": "test",
+          },
+          Object {
+            "spawn": "package",
+          },
+        ],
+      },
+      "clobber": Object {
+        "condition": "git diff --exit-code > /dev/null",
+        "description": "hard resets to HEAD of origin and cleans the local repo",
+        "env": Object {
+          "BRANCH": "$(git branch --show-current)",
+        },
+        "name": "clobber",
+        "steps": Array [
+          Object {
+            "exec": "git checkout -b scratch",
+            "name": "save current HEAD in \\"scratch\\" branch",
+          },
+          Object {
+            "exec": "git checkout $BRANCH",
+          },
+          Object {
+            "exec": "git fetch origin",
+            "name": "fetch latest changes from origin",
+          },
+          Object {
+            "exec": "git reset --hard origin/$BRANCH",
+            "name": "hard reset to origin commit",
+          },
+          Object {
+            "exec": "git clean -fdx",
+            "name": "clean all untracked files",
+          },
+          Object {
+            "say": "ready to rock! (unpushed commits are under the \\"scratch\\" branch)",
+          },
+        ],
+      },
+      "compile": Object {
+        "description": "Only compile",
+        "name": "compile",
+        "steps": Array [
+          Object {
+            "exec": "mvn compiler:compile",
+          },
+        ],
+      },
+      "default": Object {
+        "description": "Synthesize project files",
+        "name": "default",
+        "steps": Array [
+          Object {
+            "exec": "mvn compiler:testCompile --quiet",
+          },
+          Object {
+            "exec": "mvn exec:java --quiet -Dexec.mainClass=projenrc -Dexec.classpathScope=\\"test\\"",
+          },
+        ],
+      },
+      "eject": Object {
+        "description": "Remove projen from the project",
+        "env": Object {
+          "PROJEN_EJECTING": "true",
+        },
+        "name": "eject",
+        "steps": Array [
+          Object {
+            "spawn": "default",
+          },
+        ],
+      },
+      "package": Object {
+        "description": "Creates the distribution package",
+        "env": Object {
+          "MAVEN_OPTS": "-XX:+TieredCompilation -XX:TieredStopAtLevel=1",
+        },
+        "name": "package",
+        "steps": Array [
+          Object {
+            "exec": "mkdir -p dist/java",
+          },
+          Object {
+            "exec": "mvn deploy -D=altDeploymentRepository=local::default::file:///$PWD/dist/java",
+          },
+        ],
+      },
+      "post-compile": Object {
+        "description": "Runs after successful compilation",
+        "name": "post-compile",
+      },
+      "pre-compile": Object {
+        "description": "Prepare the project for compilation",
+        "name": "pre-compile",
+      },
+      "test": Object {
+        "description": "Run tests",
+        "name": "test",
+        "steps": Array [
+          Object {
+            "exec": "mvn test",
+          },
+        ],
+      },
+    },
+  },
+  ".travis.yml": "#
+# Generated by OpenAPI Generator: https://openapi-generator.tech
+#
+# Ref: https://docs.travis-ci.com/user/languages/java/
+#
+language: java
+jdk:
+  - openjdk12
+  - openjdk11
+  - openjdk10
+  - openjdk9
+  - openjdk8
+before_install:
+  # ensure gradlew has proper permission
+  - chmod a+x ./gradlew
+script:
+  # test using maven
+  #- mvn test
+  # test using gradle
+  - gradle test
+  # test using sbt
+  # - sbt test
+",
+  "README.md": "# com.aws.pdk.test
+
+Multiple Tags Test
+- API version: 1.0.0
+
+No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+
+*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
+
+
+## Requirements
+
+Building the API client library requires:
+1. Java 1.8+
+2. Maven (3.8.3+)/Gradle (7.2+)
+
+## Installation
+
+To install the API client library to your local Maven repository, simply execute:
+
+\`\`\`shell
+mvn clean install
+\`\`\`
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+\`\`\`shell
+mvn clean deploy
+\`\`\`
+
+Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
+
+### Maven users
+
+Add this dependency to your project's POM:
+
+\`\`\`xml
+<dependency>
+  <groupId>test</groupId>
+  <artifactId>com.aws.pdk.test</artifactId>
+  <version>1.0.0</version>
+  <scope>compile</scope>
+</dependency>
+\`\`\`
+
+### Gradle users
+
+Add this dependency to your project's build file:
+
+\`\`\`groovy
+  repositories {
+    mavenCentral()     // Needed if the 'com.aws.pdk.test' jar has been published to maven central.
+    mavenLocal()       // Needed if the 'com.aws.pdk.test' jar has been published to the local maven repo.
+  }
+
+  dependencies {
+     implementation \\"test:com.aws.pdk.test:1.0.0\\"
+  }
+\`\`\`
+
+### Others
+
+At first generate the JAR by executing:
+
+\`\`\`shell
+mvn clean package
+\`\`\`
+
+Then manually install the following JARs:
+
+* \`target/com.aws.pdk.test-1.0.0.jar\`
+* \`target/lib/*.jar\`
+
+## Getting Started
+
+Please follow the [installation](#installation) instruction and execute the following Java code:
+
+\`\`\`java
+
+// Import classes:
+import test.test.client.ApiClient;
+import test.test.client.ApiException;
+import test.test.client.Configuration;
+import test.test.client.models.*;
+import test.test.client.api.DefaultApi;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath(\\"http://localhost\\");
+
+    DefaultApi apiInstance = new DefaultApi(defaultClient);
+    try {
+      apiInstance.neither()
+            .execute();
+    } catch (ApiException e) {
+      System.err.println(\\"Exception when calling DefaultApi#neither\\");
+      System.err.println(\\"Status code: \\" + e.getCode());
+      System.err.println(\\"Reason: \\" + e.getResponseBody());
+      System.err.println(\\"Response headers: \\" + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
+
+\`\`\`
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://localhost*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*DefaultApi* | [**neither**](docs/DefaultApi.md#neither) | **GET** /neither | 
+*Tag1Api* | [**both**](docs/Tag1Api.md#both) | **GET** /both | 
+*Tag1Api* | [**tag1**](docs/Tag1Api.md#tag1) | **GET** /tag1 | 
+*Tag2Api* | [**tag2**](docs/Tag2Api.md#tag2) | **GET** /tag2 | 
+
+
+## Documentation for Models
+
+
+
+## Documentation for Authorization
+
+All endpoints do not require authorization.
+Authentication schemes defined for the API:
+
+## Recommendation
+
+It's recommended to create an instance of \`ApiClient\` per thread in a multithreaded environment to avoid any potential issues.
+
+## Author
+
+
+
+",
+  "api/openapi.yaml": "openapi: 3.0.3
+info:
+  title: Multiple Tags Test
+  version: 1.0.0
+servers:
+- url: /
+paths:
+  /tag1:
+    get:
+      operationId: tag1
+      responses:
+        \\"200\\":
+          description: Ok
+      tags:
+      - tag1
+      x-accepts: application/json
+  /tag2:
+    get:
+      operationId: tag2
+      responses:
+        \\"200\\":
+          description: Ok
+      tags:
+      - tag2
+      x-accepts: application/json
+  /both:
+    get:
+      operationId: both
+      responses:
+        \\"200\\":
+          description: Ok
+      tags:
+      - tag1
+      x-accepts: application/json
+  /neither:
+    get:
+      operationId: neither
+      responses:
+        \\"200\\":
+          description: Ok
+      x-accepts: application/json
+components:
+  schemas: {}
+
+",
+  "build.gradle": "apply plugin: 'idea'
+apply plugin: 'eclipse'
+apply plugin: 'java'
+apply plugin: 'com.diffplug.spotless'
+
+group = 'test'
+version = '1.0.0'
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+sourceSets {
+    main.java.srcDirs = ['src/main/java']
+}
+
+if(hasProperty('target') && target == 'android') {
+
+    apply plugin: 'com.android.library'
+    apply plugin: 'com.github.dcendents.android-maven'
+
+    android {
+        compileSdkVersion 25
+        buildToolsVersion '25.0.2'
+        defaultConfig {
+            minSdkVersion 14
+            targetSdkVersion 25
+        }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
+
+        // Rename the aar correctly
+        libraryVariants.all { variant ->
+            variant.outputs.each { output ->
+                def outputFile = output.outputFile
+                if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                    def fileName = \\"\${project.name}-\${variant.baseName}-\${version}.aar\\"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                }
+            }
+        }
+
+        dependencies {
+            provided \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
+        }
+    }
+
+    afterEvaluate {
+        android.libraryVariants.all { variant ->
+            def task = project.tasks.create \\"jar\${variant.name.capitalize()}\\", Jar
+            task.description = \\"Create jar artifact for \${variant.name}\\"
+            task.dependsOn variant.javaCompile
+            task.from variant.javaCompile.destinationDir
+            task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
+            task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
+            artifacts.add('archives', task)
+        }
+    }
+
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
+
+    artifacts {
+        archives sourcesJar
+    }
+
+} else {
+
+    apply plugin: 'java'
+    apply plugin: 'maven-publish'
+
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    publishing {
+        publications {
+            maven(MavenPublication) {
+               artifactId = 'com.aws.pdk.test'
+               from components.java
+            }
+        }
+    }
+
+    task execute(type:JavaExec) {
+       main = System.getProperty('mainClass')
+       classpath = sourceSets.main.runtimeClasspath
+    }
+}
+
+ext {
+    jakarta_annotation_version = \\"1.3.5\\"
+}
+
+dependencies {
+    implementation 'io.swagger:swagger-annotations:1.6.8'
+    implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'io.gsonfire:gson-fire:1.8.5'
+    implementation 'javax.ws.rs:jsr311-api:1.1.1'
+    implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.mockito:mockito-core:3.12.4'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+}
+
+javadoc {
+    options.tags = [ \\"http.response.details:a:Http Response Details\\" ]
+}
+
+// Use spotless plugin to automatically format code, remove unused import, etc
+// To apply changes directly to the file, run \`gradlew spotlessApply\`
+// Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
+spotless {
+    // comment out below to run spotless as part of the \`check\` task
+    enforceCheck false
+
+    format 'misc', {
+        // define the files (e.g. '*.gradle', '*.md') to apply \`misc\` to
+        target '.gitignore'
+
+        // define the steps to apply to those files
+        trimTrailingWhitespace()
+        indentWithSpaces() // Takes an integer argument if you don't like 4
+        endWithNewline()
+    }
+    java {
+        // don't need to set target, it is inferred from java
+
+        // apply a specific flavor of google-java-format
+        googleJavaFormat('1.8').aosp().reflowLongStrings()
+
+        removeUnusedImports()
+        importOrder()
+    }
+}
+
+test {
+    // Enable JUnit 5 (Gradle 4.6+).
+    useJUnitPlatform()
+
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+
+    // Show test results.
+    testLogging {
+        events \\"passed\\", \\"skipped\\", \\"failed\\"
+    }
+
+}
+",
+  "build.sbt": "lazy val root = (project in file(\\".\\")).
+  settings(
+    organization := \\"test\\",
+    name := \\"com.aws.pdk.test\\",
+    version := \\"1.0.0\\",
+    scalaVersion := \\"2.11.4\\",
+    scalacOptions ++= Seq(\\"-feature\\"),
+    javacOptions in compile ++= Seq(\\"-Xlint:deprecation\\"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
+      \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
+      \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
+      \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
+      \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
+      \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
+      \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
+      \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
+    )
+  )
+",
+  "docs/DefaultApi.md": "# DefaultApi
+
+All URIs are relative to *http://localhost*
+
+| Method | HTTP request | Description |
+|------------- | ------------- | -------------|
+| [**neither**](DefaultApi.md#neither) | **GET** /neither |  |
+
+
+<a name=\\"neither\\"></a>
+# **neither**
+> neither().execute();
+
+
+
+### Example
+\`\`\`java
+// Import classes:
+import test.test.client.ApiClient;
+import test.test.client.ApiException;
+import test.test.client.Configuration;
+import test.test.client.models.*;
+import test.test.client.api.DefaultApi;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath(\\"http://localhost\\");
+
+    DefaultApi apiInstance = new DefaultApi(defaultClient);
+    try {
+      apiInstance.neither()
+            .execute();
+    } catch (ApiException e) {
+      System.err.println(\\"Exception when calling DefaultApi#neither\\");
+      System.err.println(\\"Status code: \\" + e.getCode());
+      System.err.println(\\"Reason: \\" + e.getResponseBody());
+      System.err.println(\\"Response headers: \\" + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
+\`\`\`
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Ok |  -  |
+
+",
+  "docs/Tag1Api.md": "# Tag1Api
+
+All URIs are relative to *http://localhost*
+
+| Method | HTTP request | Description |
+|------------- | ------------- | -------------|
+| [**both**](Tag1Api.md#both) | **GET** /both |  |
+| [**tag1**](Tag1Api.md#tag1) | **GET** /tag1 |  |
+
+
+<a name=\\"both\\"></a>
+# **both**
+> both().execute();
+
+
+
+### Example
+\`\`\`java
+// Import classes:
+import test.test.client.ApiClient;
+import test.test.client.ApiException;
+import test.test.client.Configuration;
+import test.test.client.models.*;
+import test.test.client.api.Tag1Api;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath(\\"http://localhost\\");
+
+    Tag1Api apiInstance = new Tag1Api(defaultClient);
+    try {
+      apiInstance.both()
+            .execute();
+    } catch (ApiException e) {
+      System.err.println(\\"Exception when calling Tag1Api#both\\");
+      System.err.println(\\"Status code: \\" + e.getCode());
+      System.err.println(\\"Reason: \\" + e.getResponseBody());
+      System.err.println(\\"Response headers: \\" + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
+\`\`\`
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Ok |  -  |
+
+<a name=\\"tag1\\"></a>
+# **tag1**
+> tag1().execute();
+
+
+
+### Example
+\`\`\`java
+// Import classes:
+import test.test.client.ApiClient;
+import test.test.client.ApiException;
+import test.test.client.Configuration;
+import test.test.client.models.*;
+import test.test.client.api.Tag1Api;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath(\\"http://localhost\\");
+
+    Tag1Api apiInstance = new Tag1Api(defaultClient);
+    try {
+      apiInstance.tag1()
+            .execute();
+    } catch (ApiException e) {
+      System.err.println(\\"Exception when calling Tag1Api#tag1\\");
+      System.err.println(\\"Status code: \\" + e.getCode());
+      System.err.println(\\"Reason: \\" + e.getResponseBody());
+      System.err.println(\\"Response headers: \\" + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
+\`\`\`
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Ok |  -  |
+
+",
+  "docs/Tag2Api.md": "# Tag2Api
+
+All URIs are relative to *http://localhost*
+
+| Method | HTTP request | Description |
+|------------- | ------------- | -------------|
+| [**tag2**](Tag2Api.md#tag2) | **GET** /tag2 |  |
+
+
+<a name=\\"tag2\\"></a>
+# **tag2**
+> tag2().execute();
+
+
+
+### Example
+\`\`\`java
+// Import classes:
+import test.test.client.ApiClient;
+import test.test.client.ApiException;
+import test.test.client.Configuration;
+import test.test.client.models.*;
+import test.test.client.api.Tag2Api;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath(\\"http://localhost\\");
+
+    Tag2Api apiInstance = new Tag2Api(defaultClient);
+    try {
+      apiInstance.tag2()
+            .execute();
+    } catch (ApiException e) {
+      System.err.println(\\"Exception when calling Tag2Api#tag2\\");
+      System.err.println(\\"Status code: \\" + e.getCode());
+      System.err.println(\\"Reason: \\" + e.getResponseBody());
+      System.err.println(\\"Response headers: \\" + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
+\`\`\`
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Ok |  -  |
+
+",
+  "git_push.sh": "#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ \\"$git_host\\" = \\"\\" ]; then
+    git_host=\\"github.com\\"
+    echo \\"[INFO] No command line input provided. Set \\\\$git_host to $git_host\\"
+fi
+
+if [ \\"$git_user_id\\" = \\"\\" ]; then
+    git_user_id=\\"GIT_USER_ID\\"
+    echo \\"[INFO] No command line input provided. Set \\\\$git_user_id to $git_user_id\\"
+fi
+
+if [ \\"$git_repo_id\\" = \\"\\" ]; then
+    git_repo_id=\\"GIT_REPO_ID\\"
+    echo \\"[INFO] No command line input provided. Set \\\\$git_repo_id to $git_repo_id\\"
+fi
+
+if [ \\"$release_note\\" = \\"\\" ]; then
+    release_note=\\"Minor update\\"
+    echo \\"[INFO] No command line input provided. Set \\\\$release_note to $release_note\\"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m \\"$release_note\\"
+
+# Sets the new remote
+git_remote=$(git remote)
+if [ \\"$git_remote\\" = \\"\\" ]; then # git remote not defined
+
+    if [ \\"$GIT_TOKEN\\" = \\"\\" ]; then
+        echo \\"[INFO] \\\\$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment.\\"
+        git remote add origin https://\${git_host}/\${git_user_id}/\${git_repo_id}.git
+    else
+        git remote add origin https://\${git_user_id}:\\"\${GIT_TOKEN}\\"@\${git_host}/\${git_user_id}/\${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo \\"Git pushing to https://\${git_host}/\${git_user_id}/\${git_repo_id}.git\\"
+git push origin master 2>&1 | grep -v 'To https'
+",
+  "gradle.properties": "# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the \`gradleProperties\` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
+",
+  "gradle/wrapper/gradle-wrapper.jar": "PK
+A	META-INF/PK
+Am�>=@?META-INF/MANIFEST.MF�M��LK-.�
+K-*��ϳR0�3����-�I�M�+I,

+�d��Z)�%��*�%��r�r
PK
+Aorg/PK
+Aorg/gradle/PK
+Aorg/gradle/wrapper/PK
+A�%Ӧ�
/org/gradle/wrapper/BootstrapMainStarter$1.class�R�n�@=Ӹu1���Ey�@_Iik�6�U�@.,Ru��L�!��G�	�6 ���(ı	]t1ss�չ���_�x��󸳈�
�ᾏM|4�i��s�Z�}.���k�ތ�=e�d/c���Υ�e<Mzn���1�g�(��qn�Q��4S�'+G#e�y�
+��Tj�u�:e��t(@&�9��V|!?�H��K���$ʤ�G]g��w��(3�V\`�_(�9�T�G���&�D
+l\\\\&�d���dyA֩r�<��0�#l��(�>i�0�c��=<�O���b��+7.P���m�B%����M�
+�-�wźl�6i<�Z2�93�����#��ұw�ںl
+h�������x8F��E��v~�ė�9�P%p�w8
�.�R3�S�	ѵ��Ac�+j�g�QEoN Sz��B�z������j�\\\\�:�����
+z
Q^��oPK
+Ai
,�$
+-org/gradle/wrapper/BootstrapMainStarter.class�V�SW�sٰ,�1*���BI/�V�V�(�-
m��.�!�nv�f��jﭽ<����	�%�2�ӗv����;�IIb���ٳ���]7�>��1���IF2^�	C��0%c���A�0#aVF�d\\\\�{2�Ǽ�d\\\\�Uq�BNP��p]�R2\\"�!c7%|؉^|$AaQ�ʋ� .aI�~
 ���ee�4��1�r����tSwN3��+��U��U�䳕�\\"��E�(a��k����{��w�u��T-��.�Z��黶�����9�r���h��u4���8C�,����-펖64���:�n�=�n�/�w�hv�<�l#� {.'�a�nVf��ӚM����U�
+[��'b��0��^�SXB�D�]Î�.I���,[�X��͗�w��$w7'nm���H��SçI��r��=���btr6���+�n�e	��:K�YP���_�_�%u��P�-q
+i��g���M�-{�\\\\f����I�jW˔0�\`�
+N���V8s��K���b���
+ʇ���2�_t+�c�O����f�\\\\�ɧ�X�C��Cϖ�K�����
+���9%�9
+,�H�X�
+ʩ���;
+�c��|�O��}�.�w��Tk�)��3|N�*Z�R�RU_�K_�k�z�3�U梾
+��\`\\\\�4�T
�[�၂����l����#��+*0�>�i�X
+��i�FZ$K�]�h�O&�������Vo����FW���c-�M��D�qh�ƛ�:U�T��T����;#R�Nv���R�zH$['tk=��e��&ś�o����h�8�6�ls�ܕ���P�=��֣
+�e�d�,�X��:�׶�\`�Զ�l\\"�z�ϼ���N�E�/��w�ۼ�-j=𒶨���y1/[�\\\\�f	�U�e��v��S/7,��xBY|��͙ZI,<�J��G�x��&����[������
+�_�
+Ct]b	:OIӓa�$E��$��>¶�C��w�\\\\�����o4��
+Hn\\"�#RG�w�
+��Nb(Utm�{��ۣ�*z����*�c�h ���#9_xW���c�h�yG�}�ը�/��C��C�A����S�s/A݇���~8�#�E�R�7q%��B��#
+ܤ@-8q;Dv�{K�0�*���G����c�M%�8N����M����UK��;I�1�D��	�%Ğↄ���DvN��ަ�D�����g���y|��px���#U��c���������U��]����@�}���i�P8�T�(�j�@�	�1*B��� �qg)<r�
+��
<��8�dܾ8O�d��wS��PK
+AhQ�}��#org/gradle/wrapper/Download$1.class}�M
+�0��h5�*v/����?�B\\\\x�؆���T{7�C�)���
+��^���C�0 $g{s��Z�[�mE�,�]&;�i�����ڜ!!̬S\\\\9�k�'�J:��-V����6Zx/=!m��F�ӥ�YM��iH� t�nX�~�~�8\\\\j�4�PK
+Ay�[�4�Aorg/gradle/wrapper/Download$DefaultDownloadProgressListener.class�U�SU�n6��eRH(Z@�%U+
+ik[ J%D��%�
+�.���@��>�ԗ���_:#Bu�}ә�#�z���qF=�~t
+8�ɹ7��s�����'��+��Do4��ҌH�5ɜm�9��f�� W.����&�a�@��[&�x;ra�c\\"�	i.�4p��C��*�3t<������̪ϗ���)(g���,Q�\`8���1o�u<^��{_T��W�^�Ŋ�ժ�{�_n����v��<���
��o�!<ꕉks�vŕ�҂�g��C+-�ĝY���}1,�U��1q�ל\`��Vޥq��ժ��s�:���h�庯�V]�nE�ZS��|�g\\\\d�M�R���e��!���!Z�\\\\J�[	�d'̭�2c�J�&�r]qRru�J�+���8	�S�Xm����ٚ��Mx����o��r\`{.�h��-��g�T^*wS��٢ߡ��d���l�2��gPZ��Um8l�����)�A�X�F��	���y����k�50'=�ұ�A��Zu��3�57��ĶS\\"�x����n�\\\\7�!C�T�D��M-�%:���ho-%+Ա��B�fuN�I�Q{�E�qM�%���帨v���>E���[��[�NMLݠʧ�77PPb�d�15�/N�nj3����RZl�1�eShK���|^���dS�:83��m���1t��Ȧ�1$���0��p��1��@����:X�
+���������M�
+:��)�4�G��!�Lx���G/���6�p��I�ͩ7�x�#B_\`����8���w0�=m�u�d��C�C-��\`�I���ˡ����d�)V�\`���.�_	�7R�;!��
��a��إ�3�m��KH)v#�#oH��վ
����VZ��N�I�r.n��{��7��!=���IbN����7\`����h
+a.����yD���}�����2^@�#G��e!��YY�c�J�\\"#��#K��xY&�-/�D15��4%�
��%V���k�T��D������%�|�
+�@�ۥ��l�ܧ�g�h	��Ј��|/�7/]>(�B�_PK
+A���ۡ~4org/gradle/wrapper/Download$ProxyAuthenticator.class�U�sSE��M�Mn74�J�X�1I�$E��E���\`�a���ۛ�����xsc�?�3:���8>��8�:>�W����۴���;��9��s���9����~p%G1�ᴁ>���3Q�����q���u�3U�(>�༚/t�\\"&t\\\\������zp�@+o�踪�C��nU�y����seO�l���D�\\"�ܤ��خ(���X�y��TGdz�!\\\\pK���h9r����ĚM+��k
+{Ix���a��z�͉��.�2��z���H�\`�jU&����^wY��d��z��=�uN��Ż�k�s���Db�wg[%���)��}�r���wM�f��Ū��c�0��� W�2\\\\��_�Gz�{y5�2�8�\`̻5ϔW,�tlg+�2�x
+�9��_IE�)����s�Xбȱ��:np,�&C_{�j�]��
+V��n��+�[�q�!�n�p8��+(���!���59N\\"ɐ���pt������L2�R��8uӜ��&�d��YQ����j9$ق��$_�phvn��2é���%Q�8W���h�P�Yg�Ve��{w�m~�KTa��ZM��A����k�e��~�F!r3��{��h�����4U��)U��\\"�άݕ��ⰱD�na]x�'6�aJ�W
+�����RH/a���>z�Y<�nI!h�RQ'�N��4�����2[}K��
�<�4�@6po�V����/ia�k�:����7�H�C/f������.o���;�i�#�#k�=SÿblX�6=��G�\\"�<<R�+[�O��z?HH{��(�����<�o�3��Xş���\`�oT�O�L�^E/�&��o��ٌ#E�\\"��H5M�G�=���g��x��P��I2)�2C[\`��7��h8U�0U���Ar�eoByQ���N�p�/���0}��PK
+A�pO�)�&!org/gradle/wrapper/Download.class�Y	x[Օ>�Z޳��J�DI�8^I	�\`�+�Xv�Bx��m%�$��,�%��{X
+�,�t�����9�@�-	{�lt�鴝)3̾vh����'Y��I��|�}��{���s�_��s/�*�Q)��x�?�<���h~���x�Ex�q���~M���c4��Ia���K<d�C��^:�.��b�hѨ
+�zh{�����\\\\&�g�\\\\�p��r��}<�C����lU������_�Z�=t
/��[|��^,�sUx�
+>O�����,�R�,�Л���ռB45
+ת\\\\��\\\\�\\"񯂠7z�u�P�^��E�e��+��CW�*�ŗ/ͥ*7��CHjV�2���i���R4�D�*�6��+ܮ�m�f��U*wx(�A�7��I�NA�f���uܣ�f����ܫpH��T�Wy�B'���y@��B���Qx��ת�K��T�U�-t��U6TRyX��#*�Qy�XUxT���Ōd[TO��ӹ�!=5���Ǣq=�9N�Tg$e\`d�t�ິ9b��Ƞn�A,����ݳ�{����P��l�{�}zcT�
+7��d$6��T���L=fnգihg��o��޻+����AQ51����sUo{(�����cЮ������;��v������
+vvC�Y���L���u�20����aq�����p�pRG���I=�0���r�*w����F2��Z�i��/&�������b�fD�ܲUڌD���JC��n��P����˦v:�2ܗEb����z�����[��m�!T�Č���n#٧����A=�UOF��&:͑v�L�����}�Bh�I�W�zr�y�4S���A|ۭ��B�%�>O\\"O|Uq�0����cLd��\\\\L~�Szv�1���ᔲ����:)M���+u�݁���7�����g����<����YZI���#Ҧ�5��j���mݐ�l?����7hˍ�7D�������I���.l��H̖=�p- �~\`�H�I,�����F2�G� �2��
+;���CC\\"	��h�Ʊ�h�!���qS�v�as$O�Βx#B9����i����^����Dʎ
�P
+26=or:�k�}�Q#�6sʃρq.�p����H�0���b�$�*f���I%�����u��6N+�O��
+�1G�Oq̊��?��:3�:���*x�UOE�\\"aEQ�O7���g07x�ׂ�!;m��2֬n�
+�d���H�-V7+�
+�Z��2̑8\\\\� �/iE�[�5~͐�Y^�&����\`fA��'ٮ'��57�+�B�qm�[�
+�yy+�]�SN�e�ȕH���n�9K�_�[�ǖ���*�& t<���
+��p\`�S]T�Gж����x��]�+'�r4w<e��x*��.98\\"n���%+/����hz�ն�u��VyB�tr��Z��n��E_P��?�7j�ezH�{�I[QKR���41��7��
+ߢ�!�U��m�3�.R�4�$��S��Ɵ���g5�}^�#tH���*�Z��B�ğ���S���i\`e�4
+	�S��4�<A���$v�i��WM���
+ߡ�|��_�5�G��������ֳ��UfH#������3o����%�ܧ����F�O��/�=�N(\\\\/���e\\\\!g�]��+?,����4�:C�G��
+?��Q~L������D�Ʌn�Y1��z*�9�N�F�A����Oj�-~J���Lx���~B��۟�	�:5VZӑ������ ���р���gEs�(0��bᦀi��d�p�Y�1���9)N��荋�y4X�l7C2Fv�ԯ�	{�M�� u��@BO���ؓ~F?�%P�K����m�z���W�S�0}}�2�
+s{ �;h@���)c7��d��d�g�WIw��}2�;-x���X�����tn�P�\\\\lOFn�+��RB�w����/k�=�>�+� ��U�	���x��4%�j|��؀�_�$�b����▧�}�k�¯j�����m��D�7������E
+S@P4�6���
+�uS7qcn�n�V	0-�Zq7���P+b�T\`���o�T 7�t\\"�6�h�\`�v��>+4�д�MU!q�]V����m�N4쳫�f��jPn
+G')J<�\`)zd]֍�KS�KS�ꥩf�E^W��;HWE2Ip}��y�LIr%�e(-ei����>��#�v:�rM���t�o<�9,�Ǟ�:��7���^Ss��
+�'�8 � _����E����7a��Š����SI5�3PU
{�p�V:�����|l�]9&���ܕ�
+]7��j��N;�;�z|I����)E�o�?{\\\\��cXXaYu�n~��W��&���N\\"i��<)ôo���;b
��!�'A�@[����{�=�7I*.3.1���>)>����������������\`�̂����5�O��g����6>��.�Xn˳k8�W�zH�z8G�{�߼<����sb
3� ������GW��V1�(Y9U��(l��ߢ�������y��NQ�;@R��8���N��@��>{�cb�F!۵?��F��4Ai3����#F]��xJ<��d����fߞ���	���53c!�)��J����!j��~G<eZ�ͨvO��fK�U֋><*�I����tJ��Lh���hj
+���n)+���d��$�قvAu�Og��0��-n�Gx/��0l��|e�5;��ɗ2��=���\`�Hl_|/�wic�;�,�zД��,vB�ˠE�m3�N�b�5��'Gus�VE���n��b��<�[���Q	}��m���0Ɵ�
+�O�?��g�>�TE�'^��{��ŃS~�v�ݒ��п����K�� 79�-����Tr�c�|F2߇փ/�E4�V����X��=(�ZT.�g�
+�ȞP���x����؁�X�y�\\\\c��ɐr�T����T���K����?I��Z��,�3x�%��z�����ę�c�锚V����ZR�ZJ��&j�nj�Z��RZF_���-�k�u|U�oH�<\\"%��\\\\��5w��\\\\9M>��*��� �B�[#��T\\"��	,*�pX��K�Y>xBz�I�08�> �������TYS�|5~�q�]�w'��9�uc4�8U�m�p�C�|H%j�	��R�nZGs�(i�崞j�]���#綺���$NJd�t��	:eO��%ͣ��w�(.�,���S���&kϊ�g�}�O������rt���i�@
+���N�9��%7�E����S*mm��V�Q��E^P�M�l���C�,�������F*0	\`Kp��-98����
+��ҳXy\\\\nƴ�Lv3�XQ��mws���������t��8-��K�hY�ߝ��MΚZ�s���M��	�*�ryE���o�ߙ��&We5=�6�bt�O�Zo��2�˯fh���Ғ�i�	Z���qZ=�x�֜���-=���V��oYU�Z;Zz�C�a�s��h��k����ZЪ�'�R7�WsK3�tt�ALU��3t��u�T�+C�ן������&El8NW\\"l��Z3�&η�׎^�6��1��TSyq!��/?�,>�ަ��S|��}�g˯�x%�
+�\\\\�i1�D@�殣U�#�w׃�0�m4��P\\"4_���n�(�f�N�gI�Y
+>5�{���H����f�	�sd��� �#�Mn�Et�G7�2:�5t+7�m��V\`�>\`c��)�9M'��\\\\Kρ���h=��K����!h�\\"ze8�:����n���GH�b=��Y,����r@�׺��^A���@�@��w�;����S�C��z]�7zS��d
+;��L\\\\,�.����JQ>��	��\`��)V芰BoO 	Uc�����a{�E�*~wig��\`g���ǩc%$�h6�g~DM��O����-���1
+���@�\\\\�mn���;��E�?�~�~$�����+︉u�K��<���� RdK
+���?���믅N��i2 �! �|Wg�g1SS?Fۭ�A:�̀� P�(����V��@w9��d�m�%��\\\\�j�?@J���#�ƅ�0֯�����s5�ޥ[��(6��̶#C�t��vf�Z�.�t]���:�n1tb<���C 69��F���\\\\~�߅Ic�Q����^��1��+VFW��\\\\���)�5*2&�U\\"��8��z���j\`BH���|��T�K�������-8�H��^�������'�Ѐ��S����G�sxp6�h�����%z�H4���ȑ���H�↉K�O诡��p-�L\`{��1�\\"�L=�	IŒ�!�XH�S8�MVǘ���D�Ƴ���t.��BA�rmMJ�[:�],�!��<R��ӋH������Ӗ;O��7�w5����-F���vPgM-������l�Tb
ջ��ɬ��r�*<��;���CTG1ޗ��xn���P%P0�
+�١
�-4���B��PkC�:4J}�<�+�V4��ӝF���*��5�B.�IoH�tXǰ-R���w�Ë���^Z�9�}i��i+���u���C0�NZC����B���ۈ��Hy�I�ܒ�4�b���п���Q�č�I���9�|7
��^:J�KPK
+Ay�L���1org/gradle/wrapper/DownloadProgressListener.classu��
+�@E�+�jD��E�@ۖE�ER�I��#3c�[�>���4�v��9���������O�Ī.r%��J[��M	DŽ�,��]���8��kߟ_�PU:�]�3a���G�����\\\\�^�&a�t\\"-�E�eY����˛�8\\\\3��K tЎBN��k؁�
PK
+A!9|��3org/gradle/wrapper/ExclusiveFileAccessManager.class�W�sW�Y�ګu|i�V�MNZ*;��J�lB�N�K�Ǝ[��t-���v�j��S�B[(���P\`x�3�L�$x����0�
�}�0��+9�%L=��s��ݿ����O�����t<�gZ��Y��jxNG_�pNGϨ×��x^mME�SKA-E�H
+�1��::\`��vI�b3lIŞDIG��qu���fxJ_�~O��c�u,�J������
+_��5���ɡ�#���SgGF��
+t�_2/�Y�t�S�g9���C�S�Mǟ1��h�t��DE@�v�]��;��.��\\"�,��	�2�|��@t�-R�m�r�jiNz��-�=�\`�3�g�s��,jɎ��|v�3���.yf�,���]�X��e��BAV*�c�K���̀ 0�	�ܬ��OU߲��)T=O:~vȴme��{]ԓs�d�W�䕲�-3�Q�d��E��!�C���q�]	0�E�(��;&f�*2�B5���?��^����}��虫\\\\j�L����C���l��tGuZ��5�[\\"
+�Mn,�r�Q�������t�1��)�,,N��@L��5|C�75|K@g�dٷ�'�hʚwL��Q���tnk�}�2�ts��ҟ&J',�VXj�t��%syN�nE>]��o3��;6���lK�q�oF3�V�B�����>%l�W
+�!�8$\`���������Dղ��3�\\"�x	���D]A��مE�U
+��W����x���c�L�Q��V$��Cn�.��O<i�2]6U����]/� ��H�i���~\`\`��,\\"ޒ��G~��xg4�n�
+�)��gLڽ�V���� M
+��^2-��	L��\\\\:l�����(�3�e�:�j����qZ�/�WY�;A���}3��r����S#���
+^L/x�R��X�	|:�u���L��i���Y���L�v�;��������u����!I���=�A������ўf�U�yLX�uc���U\\\\���Ӧ� p�v�Q�Nεv5�����|o9L�޻rקt���K���Ul)��̨��;��Wv����椯�74O�Ҭ�
+���+�,1���
+�F[F
+�f��>#�&��A7zx� �N5@��T3��(����z��Y�4�}�
+��] ҳ�4�?�E�vqݏ�<̏ ����L����N�p�8>K.���1��Dg�[A|�4n�kh�Lp�����S���ES�v\\\\�c�����~]+蘭�vvR���5dw�������=�#r�<��\\\\K��T�����8���lo�7�\`.��Ր��S�
+W����ĮT�U4]����~�T��7��6���v����7�BZ ��H�
+ҫ@'�c ���Klϓ��3�1�����c�����DQDDwp>���P�z�p}���@8B gmγ*&_$W��
+��+�k��r�}�F�A?~�
�(��AZ��8�����:�ư�q���8�
+ӛ�\\"��؅Q�c��?�	z5)��qj��sDP�h�	h��F�9҈����u�>�c��~��iMȈvz5�HM���� �����$?b�)n�I�P�$)S������ݳ��hѠǧB����<���q���0��.Ҷ���x��d�(���WW���w@�M�߉�߭5S<��
+�a�<��u�.�˟�3��Gh���G�At�=��dl�٦@]�������ys����:�m��O�	
+�	���8x4�?PK
+A��,y�-org/gradle/wrapper/GradleUserHomeLookup.class�S�N�@=$v��ԔK
+J)$����E�\`@\\"\\\\�@�<E&Y��#ǡ�_Ջ�H}�C���:�K �af����9��?�~�0�Q�Ix&c\\\\��
+B���\\\\�_DЂ)	I
+�d�\\"��1-�Y��eceq7��_M/.���n�H�׶6-u\`��m:%=�{�S��0t���Nom�\\\\~��1t,�N�7?k�UN�����l����_\`h�'�mKn�6t�,�oV����c��\\\\�p��5=K��\`��oU)�+�%�,�\\\\���2���\`�[�ޚ{�S�{X-���R��'j-W_�lN���o7�r0F�+y�\`ׅ*����2Ě�I�~*z��0qOi$��JV	O��^�x�9��@��-�o���w�S�C����j�E�1D�ګx2+���\`��H}��n����պ5B'�1������d�?a�߽8�fw���nB��q�
+qhN�a�^-�N�3߽��0�d6��È�jELU1tS&>�-
�sc-��g��O�N�QM��}(1����#�j��
R�\`�뛿̀i��m���P/�Q��WM:����;\\"��+)	Q�g<D��)�\`�W�%L&|
+�[��[ˆ��_��%��7p
%w�vM%9���:)���\\"��a���h\`��PK
+APr���	-*org/gradle/wrapper/GradleWrapperMain.class�Xx�����բr��\\"�E;�\\"L1X�!	$| @D�����n��%N�t��F��'q
+N����Nwz��齓�8�g�t�� }�>4����+�{���>��ek�\\"�T��R���rx����y*J$��Wp����B?^$	/V��ԏs~�L��UTI�*�B.�Rūp^��U�qɯQ�Z�N��[����*���я7��foQ�Vux��Z�]�;T,���;��ǻT��n�����rx����������U|��0R*F1��\\"R0��#*6ᒊ;pُ+r�G�xX�#��cr��*>�O��S����H�G�H�?�����*��/�����+*v�sw�ki���n�w��kW���==�]����)�1�LJ�m+j��j�����Ѥ!,������no�ȩN����l��P�P6�l��#���P�~
_�9@m�H�؝�3��XԐF��zt�nE�<M��Ñ����i
+5Y�@�h<m�##�ոÙpg��H�N�b��:T貣]��(��cY@MKީ[�.G�l��\\\\-�L.�#!)�e�v[��%#��0�Q�mg4��j�bz|@:��ᡠ�~3~���
+���&l#�'�*K@��6�P�;��y�t�d�#{e\\"O,!r�Kڑh�$]���ꥱf�~�D͡!i��(��E�HS���I�$�/��\\\\��3��뎂�18��@>D*�mpn�rg2ⵡ<Z~\\\\�Җe+����LOid&5��ػ��k�(-�!v������c�	fe�n�5�'m��v3h�,��ݶ�b�>�$����
+M�S�Nk��b�v�I��p�|N�A[-2<D����QSа��[C���\`F�:��o����d�N\`(�Z鲭JR�a氆o��
+����yN
+�LF[\`��q�4|?��C�H��5��1�&��CO3�~��)���_��\\"x����pOW�+
+��o�{��)�r4�S�.���k$���Ep��n�$F�YcI������=���h%lN$^L8ס?��Zv�%w��ɺ'��I��5���7ܿ㪆�*����k�@YΖ�_r߿<��?xB�5:$1CE§�bM�p��9ADj2'�%�v$fd)_�5Q*��
+�xM��L\`K���vp���1�0�/���
+�V0�I�?8h��\`?{�1=a�/M,_���]ǎ��&41S�+WD�&*E�\\"��S���\\\\�pU�51G�eF�y����|I\\\\ �\\"j�y(�΅���:��Ѳ��45O��O�y�&ŒP�t�S���ѳ�^GDW��M���-�P2f���L�ȕ�s02����Kj\\\\�3��;�y��x�άmNq\`�2��v1o�]vS%���M�*gIai�ϛ��R#/ I�EV�@(_1���
+�����-�Z��z��y=�0��BS5���U�U^'z��jN1u(���8�D�*�
+��U�=�=]���Cd~��\`>E卭��Zx��Ǵ0͜�-N7J3s��D��^�����}Q����.oV���Bӊ������JT*&�N�u]��6�6�G��>�&�O0�V�>ۘ��<Qȯ���#�1�-�/�����7�Zk����\\\\,3�N����sK{���6���)/���������#���?l8�y�dR�����nwk�?H�������!�=^����WZ���83O�i�є�!���.Mx��LсB*�������TI��BՖ��Mt$O�	�f/���<ӳ�M����~�{]�v�<�¦y\\"9��N�\`�~���'�5cvs6e�we�5��d�+8ߛ5���߼�s�!������
+�����˱�!����2����R�� ��Y��Qe�=2����1�vq(�=���Q(M�_
+�5��K(�+
+�u��Zw
+3S(�$WHr�$Gw��k����_C
+��J�0�I�QH-���Ma^
+55\\\\�������¦ҕcXԤ֨
+���)���!ō��#�(�b�8�Rֲ�Oz�
��	t��֣+0+����с5�&b���
+0p3�\`�D��f�c��c+F��ވ��v'|��^:LDKqG�5����(��������$�1@ԏrn\`�1�s�P���w���9�t'(�<m�\\"ƈ�=&��I:BYE�]LTB}+��h�
+��Vd&�(w��@ݮC��P���+�8$��:��!�V�!�_e�J�߅�,geY��(\\"�ђ�+���U�[h�I�Q���'K�܌8>R��#�3��PSX���6�p�m�afx��V��+T�hNa�=�'��[}������{[G�+���\\"�	\\\\��jE�GrSh#n�v\\"�J��m�\\"в
+��R5h!R��q+m��d� n�������8�Y5w�f�	�k�:˯�L8w�����o�����T��N�JU�M;��dP�(Ka�ݘ�X,';R�f��S�X�t�j1�A�����DWi��Q�C7�fSZM�8vRzU����D�ĕ��	<���PK
+A����\\"org/gradle/wrapper/IDownload.classE��
+�0������
+^�b��*A�{���(����l|J�Tf $_����uX���! �����<!L���_9S�d�]~)�l�IΎ�\`u�EQfZ�=�,���Ģ���g5�	cmR��H�*ËB�hÏ��*e�S.�0���O�A�Zp-�-յcӳ��
+PK
+A9l�V�\\"org/gradle/wrapper/Install$1.class�Xy|w����,�
�PBh�Zls/�*��BB1m !�����!�3��,�zPm�G��z�XE��lB���@k�o�V�G=��SE}of7��,)1����w������M��硇
��?�a,n�ܼ���7���%�ˆ��2d�yr�G���\\"�_�+/�����	�LF7^�͝�p^���e��b�W�x
+�	�L��^ϲ� �x�����-L�V���Q��1�������w�x�-c��H�=ܼW��Bx�!|HF>�ai'$|T�:�/�	?&��NJ��@��XaXQ�Г7�&���zD��V��ʙ&���6�X����\`��-��6��L͉�v��eL��Cz<m�L'P�a��H�Vc���dR�#}^ߚOJ��b5=Cꪵ�z�	�JO����H�qb:Czj�J�奴��)G5�ۤ���Eச��Pj�;�%j�յ{��V����C7��tbP�������^��y�]��)�v�$�Ji4�j���h�C�IE����8��i�a	�teO�\\\\$h9���$Lv�)�bA��SJ�wn?Ւ��	��l�|��i�T�5b�#�
�ZJ=��cMq�d�vD3�t�
+O:���%�U��;�̹���vS�;���G�w�I�E§$���Y;ezJ�i��s�t#�s�e��z���:i��m�I�geG4mۚ�DZɉ���=r������\\\\l���@�݌V��ԩ9CVL§<�1�q��Mج\`7�Í
+�b��V�)؁��W�\`��Ct[Z7b��\`g<���&kX�gx��U�0&|������E_—|_��5_�9��7%<��[xT��1)�;
+���	����(�>~@F�@��Y�%�H����'����)�9~��<~��WxL�����߰��\\"N�i��av�yܲ���'�;	�W��Q�����?�/D\\\\���V+mĪM˩N����jJ�jǢN4	��55e�-$��|���
+�¤��i�u�MGOhSB�Wt�����%+i/ƌ����F��KL�\\\\г���va:Pљ^hw4*\\\\���kQ���^\\\\)�6jk��������d��Q�|5\\\\$��5g�ʧ��@�y��Њ�p�6\`�&��ƚew�R��r,oI�ښRe��~�멶�\\\\s�n��g�B�s�\`�2Ҏ�Ku��1j4���ZIWU|�WP�1�P��j�Ym�lj9�49�U�[:��y�c���c)G��ܧ�v���N���45�g�jּyΚ!���BR�g�yq)�P��1.(�e%�O�W�U��N�qM����m�;֚guh�wX��pg/�����0��aŧM[˦m��i�9�l�H��vX(65���c��� �(�)��X��,J�|��{v���g>B�T᫪���D����T�v�j��t��
7�
�s1\`�t�.U�z���{�̈́�z�e�%ؒ��K)y9X����튢u�,5N	V>]���E�#�+�K�%TӗN�>+*�)P�%�Ӄ���M���,r{z7�7��~;�|�n��� Q]]�D]��������������Q��fj����-�V�I@�wĚ�A�O�#=�[\`=e�Y���DY��B�G�7S2�_����ӻ�V}\\\\6���T���/z�&pyg��\\"D]թ�XB���~i�'��>H���6��?�e]�G1<�	˧Lh��YQbWfI+�\\"���&����kX|���!���]ۗ�x+Z���
+�3�N\`�yt���e�%X������tLϚ��pp�}'�;��Ƞ.�z�G?�l�n�yjOඖ@����,d�+��/;m.P�Ƕ�-\\"����>�G=��d�k-��&��ⱶϝ�:�u�<�b7LB��\\"!��1�w1u7�q��Q�Մ�5�����}4$��	�#����;	�'	ߧ	ݏ�#�=I�~�b	n�q�؆�]� v����na�G܏=�z�#�'Σ_<�
���‸�[]L�L��a7��ORN��v?ɮ�^I�~��m
Fu�5�q�Ӯ����rk?���Y��Ӣ/�A�r
+��i���n#O�����II�~��Hv9B��,��{��%4���QA#6?	:T���.�\\"n�r8���Jf��dO0%��!�^�a����%\`��F���
�_7��@�PK
+A�gh�|-org/gradle/wrapper/Install$InstallCheck.class��]OA��i�]�l��T)��	Q���hR���ۡ,,-�m��
+�H4�x�?�xfv�I
+m����;�s޳3����\`�đ�a9AaE�2]�Q�㚁�ul0U�W\\\\�~\\"R�#��[N�z��1]8����Į�}^��\`��kUk��9�*���U櫚�஻s(�c�ք��r�>�v�z�X��V\`�����S�Y!%�M�:�N�BE&�NM�n������]�ns��=G��E��eZ���M	�V���Q�ǟ85��a�2���m:Tq�
+�㗄�8���-�cH�5�}��Oæ�:ɮ
++����X��%\`k@��h�6$h{dP�	o���jgʤ�Woz��e;lUBL������0�4a\`��m�ѱɰ8�#7qK���oo�G�n0L��6���Q	z�\\"HK4KK;4&('w�J�&4�
�O��Y���Ju�b\\\\�aS�Fs3X��a�&�la�����C�>eQ'��X~�Z~��/mL�J��BcsH�Rl^!3�Ә
�L™��f#��'�yN��������	Z�.D��f��&C�,�c��?c�c���
�
+y1�;��9�ʼna^rH|�d���
+gqo�8:��~{�;��\\\\&N*�b{����2q��9�0�v�>Y���PK
+A^�,�C- org/gradle/wrapper/Install.class�Y	|T��?'�����\\"!�#�Jؗ@�I��Z�%yIFf����E[����Ҋ]l�����ME��Z��nv��}�n_[Z�?��L&�C���/��޽�{��9��;O���cD�����\\\\$�Y�L��X���hJ��&�� ��t�gx���H��<S�fI3;�gsX�s�<��
+�
�+M���4��}���
�ҽ\\\\�qU��su���2R#O�i�Ƌ���A^�K�����u�4+�Y9����j�Z����&\\\\��s��>�
+2�N�o��A*���A�&�7i_�qs�Va;n��E���g�,}K���H���4��
�)o
+R=�I�+H?���M���A��/
+�F�Xc#H���Fnp��tJ�Rc3H۹K�� �pD�K��SF�i7OpT��4+��D��A���BN�-*�|���\\"P���A�����q�7~�4���]A��fi�-��k|���	�%���{e����UA����G�������&�)���h����أ^��5R)3�Z׸�n{��5�n��T�}[�斋��m��T�|�q�Q5��5���w�fߐ~q{�M�
���Mtw�ӌ��]�m�Q���2�IӪiV�X�L�ƣ	��i�aӺ̼�4�:�k�
+�9n���\`�t��#�NE.3�G�f]G��Jm2→�ƍC�I��M$��2]X�:z��&��|��!�i2Ml��͖t�ݴ��$:��Ê�{f�k�D๙�;;�����4ls]$e3�r�\`��á]��eؑD|u���H�Fl\\"��ȟg*?mVШ�[����o��L�qӮپ�	$��$�=��e�[�1��QQ}]ޤ��a�y�0��SZy�U�Y���E��P�:�j�]���Ö����e)���[0ّ�¼y�)ɥ�-z�	�����tW���\`w=�����x��R�$�)�#mE���M@'��.�m�l��t	�s�6œi;�FL����7l���	�����^I\\"�n���=���™�����ݡ���^fZ���|nM$��Fi=ViW�dp:7?7A��|0�3SV$�������$�?�5�e���zC\\"�M0��lЄG-\\\\3R쵫5�aX�L�*�R��eec;��l-�8
+N0:�UP)L%�V��b�ٗ4;l�S��&�j�O���- ��{$�FOb��Hwܰ�6_x
+^c�
��L��سŀ[L+I�$���A���ܸ*�s�it:�4ew&�v�j��	+fض\\"�F���'َD�g�-VB�r}:u8q�鬱2c��͹�]��Z�ǖV:	�瓌w�Ԑ�Ō8�OQ��D���I#���8�1��)+���C�W�iFMI���}@����x��xt�@�����'<��F�����h|�k��{�g�m�?�e\`,�Ak�Ik�@.GH�d�l���(�\\"���<f��t�̥v���i����ͦʒ��gr�bwVk*O&�����H$���ӂas�=w�|���@OT�4�?�.\\\\�����|������o�4��Y<,�R�����J�K���2Z&�֜9���+�k��y�2Eey�^�g�k��╲�-���L�sAߒ�]V�.��	�18.�j��3V����Xp)[�/2���gu�
+�V����~J/��8=��Ut�N�+u�A���c�3*ue�M:]K�鴏���#:����1�Y��r���O��I�
+��A�\\"a�)�o�OC�|
+�$Z7�U�Z��3|2E�l^�t����:���� X������k����|H��n����HsX�{�f���.>_�ί/��KS�Ý	3�'�0�\\\\ۈ��F�d�������
��.���ه�<�^���_��dX���\`X�����<��Q����'\\"�w
+[$±7&������e~�i�5��0��vY���a�>C���?��W\`R��!�R�Ce�p��mi�ˀs;�)����nW����1.3����F,)�C�7b�,(��O
++�{�����0?��Xh���G���@�:��y4,eS8��ږX.�%aÂh�<t��2��]V\\"��V:%�p*��X8�*���
+��J�ل��T���/;2�e��
+؄�T�8fB���fE��ښ�ۑ��+^$辊Rb8��Y��/)X���E������<}��HL�#�L��P:�����진��'�@��Y�l��O#�������t��~�{9�r9��9�����oI��J��E��#�=%ʾ�%Y���=!������/��}���?��Y26�dLPѐHG;U�6Ff��pr�:w%�ڰ�i�c�\\"���q���
/�O5~Y���u����z��R�_�u�
+�u�k�ӫ�;�/�������I�W%��Q�<s�6�(����)�������O���w�'O�L�O�B����\`F���̿�>W��y�i��|5��$���㴭�J�:ߌFV3(����G�U�LS�JQ�� �zYS��ns�JA	�m�#��TV>�.e�(��ۉ)e���Sٝ�3�;zC1E��VQ9��oe�����\\\\����V;m��+H�����s�@S���
+0�kϮi�p��CN��AA�A�.r�s(?ŝ�(�|��/�k�t�Ӱ��€9_G4�ˆ�3޲r���<2K�;�qvb���QqY�+�����{�eO��|?�(kK��m�:�vn�
;��C��cI���.u\\"�/�1�v�������}���or���Ｉ�^X�O��X��na_�H�
#�	�X�mX�x\`��{�F:����h\`d��U�p���Y���E~����KQ�H�+s���~8�Nv�kO%�i۔x�$?^�>'��M�z��j2 8F�Hj]���=�N ��S_6b�I���'�M��4S�\\\\nYT4���\\"n������^#b���a�b3/���%��W���/'d����2Wc2��mV�_k��cn�$En�^9��l8�Tb�ID���ǂ3�Z.������=�@��υNzM!W/�d?�阓��d
+x�y����,'焖�E.���~�ʛX��Ys�iݐ���#��u
+h�m�:	����e����]^�,�[#o�&��M	�l��1��0.n�ٙ����%
+�r���=��xhYc.�j�uq�v2�zq��t��r\\"�Q��M��x+��P��9�H. T���Q��t��@{=����v8x�ϭ�Š!
+���LO�~��WT!����+��Є�j���N~�s�2LS�\\\\�0�fS)���
+��px��F\\"�$2�z�
+ԓ������i�R�4�k+h�&4�Z*�	x�\\\\�
+y���'�Y�~����hJ[E��UUVR�M}�J�%g9t��*�ZM3h
$_����얓s-�D�D>ZE������1�׃�t3}�̀���O�jͤO��O�b�+?�5�w���0����iG)�i���UҌ�r��I��@���[p+ͬ�h�ro��S'�T�y��䬃'~Q=@��^뗇���
:��;D�A:���Y�/����n����D�[�_��4�Vit���4.䛴p����d�t�U~>x�9�n�=r\\"��� �yT�z�2�*F���A
t.��������!�Xg�Ja�E��7P�Z��vR�S?%
�~z�.��&�B��&-L>K��8!���
S&�|��h-��cV\\\\�?���a��/ҝJ�}t���-t>�
+.^쾖�D����u)i'�֯�^�J4�W��X���^���5:�/MƻFa>N�4jx�Əp�
+f�y<}\\"<�k�~��3�)Eeއ���S�z�*�R�=��B�Sգ�<ЂD�G��k Z8�H&ݣd_̣B�WC�}���u�����â�a��B7(}��9�u)��z:
+�����=���a�K_Ƽ�,+saNl7�<�)�ѱ��i.�7�,C�,OaKqTC�TWQ5H�k���Kn�E@�ҝE�4�\`ek��[�|խm@�(\\\\��m!� �|�p������h�n
+�[j��_	��#7����=H�B?�W�W�$�!g�zL�Hy�p-PO_Ua}X%Q�7�k�8=�s|���C�
+QW+ii�
Z�nM�^R-�<��	�b�mt��b'�t������- '�^���;��~���
���U��¬s�d(����I(�r�n�8<���悜s���0\\"
+W�����
+�c}��{r�ŒN���g�Y�؀
�J��pl�w���������̓T��[�����5�y����E��9\\\\��u��w���q䠦�~�6�
+�m��<H���y}3l�6��[�jOPIH+���J(�:@�;����Z�L��<�8Jo�6�%
+�Іh78����t���]4@�6��ki��oBq\`����}�����y���R-\`VX��.V����ױ����4�����,��΍o�\\\\x��V~Gy4	���i��$�JA�<v�Y��{.���mP{���]�|s=h_��cl?<��@���Sa����{1P���)8�}Y�A�z�~��F
+	���l�	��D$D�A�s|lB/f���ILM/2�R���1@�͕E�u�N>�!ϡ\\\\l)q_��߇y��Hc��!��N�%�\\"r�������Jfף0���*�����Y;�
+��9
+�U���䕣��y]�A�ҥ�\\"�Q��,�Sl�2b�g��ϑf���eZL��E\`)�~�9/���)���/�+r~XA�R~Ɠ�?4A�_����@~/ʔ���DҍC�#�A�G�%�h��0y�2ps�&~�JD�*yI@�
J\\"��KHVۈ�AJ
+��rI���.���=H���
+i<qv�J# ����.ĹoA6�l��#������X�F�*f��$�d��LC��wd����8��R��Bߏ���6�s
]�ڇ���?��\\\\aV
+���~{]����
+�=A�*�Qa�Ɯ�o���9w#�YA�'�_ �'�������դ��&\\"�4��qZ�Q�JB-�2�a
+J�d8���
+T͐;'�c��?3�����8R-���̶�ޏӄ�jU��<�
+�7٧w��S%*v�s�&�8��P�L��<)�L/��Z���.�k)���:ӝ�H�пU]uXi]p\\\\j���S1=)_�'#t#V��UT��W�~��%B�!��48�1�&.Ċ��9)�W:
Z�^�|��Y����=�uY�?��>�g�f�_k���i�w��n|��ΐO!\\\\�y�#�
+���N�v��|5r���-
�L�D$��[\\\\���,p������<w+<
Xt1��>�1�h=O�׀\`ރ/���N�mS��w�砲+�PK
+A�:�o4org/gradle/wrapper/Logger.class��ko�\`���Unc��@�&s*]7��11$KH�\`�w�ʓ�����_�O�Fg�?��x�R�5K���r��w.��??
h�G�b���1TP����4w��+ͶU���]����.;\`XxfX���!R9���Ӳ��!�1,�j<8�>?4�d�ck��qǐ{�0�#�b�vtUwx�����Q;����6m�!W���\\\\5���]�1,�)��@�F\\\\�s��˵w/��'.Hq�ϰ3��:�NW�����fu���-Ce\\"��!���l�U�#�;��m\\"x�*�@o���b�w����=C���j[�$�B#��
+�%q<L�rI�X�'�<%N\`�������F	�\\\\��\\\\�c���~�b@���r�J[}C#qi0�����4͡ܙ�z�|�w/��\\\\L~��sW(��5��e�N�S��Na�l�v{��k?�j��}�]Kd&{��Jo�y�Z�VR�Ɖ�|�}_3]���'Ŀ\\"\\\\?ED
+�g��PP����pz*���U�{QL�[�5���	�	!1!D��>�c���I![3�̔��Jg���X�&��ov�HIFi��
+Q��V�(�Iؔ��)r��
+/�,��*�������ꊧP�*qw(�P�&n�_ݖ7ۛ
PK
+A�\`��
�8org/gradle/wrapper/PathAssembler$LocalDistribution.class�Q�J�@=������x�+�P��AA(*(��mۥ���M��RP�?J���*�/3sf�̜�}{y���,R����6�.�]�0�U�J.d�a���7<�q�/C��-�IŐޒ�L���M�h���ٍ��!W��8l_��:��2~)����+�q7�$u�b2�=Z�d���8b��H�ݐ�Z�Z6J��5ū�no6�
+�yRߡ�
+SK?��
+~M$_S�|a���Y�WЈ�I�V�
~ϒ5�����>��p]�1��_	1*BՂ�rCT��_q�iX�OL��Z��|-��
+F��d�	�S�M>W|+�<�*�>�~0T���u��h
+��Y��
&�㙉�B�b��5
y]Ka�O���u�F~%���w��-�;�<y}��)ҕ�PK
+A��;+&org/gradle/wrapper/PathAssembler.class�V��=c-#���I���	�,�I	�8�D��,;�F��H˓H3b���N	k-�RJ���%R�|�����3c�6r�/o�{s�=�w�����~�8>
+�VZG���0T\\\\�u��e/�<��x<�6�������O;����5�D\\\\���[�v�a�8�����>��~�֓\\"n��0��4ψxV�s!<�~��^�@?f�'\\"^
+�e6_	��^�u�Cěn���ri\\\\5-C�ٖ�k���)�XI6M������兹���ə�����lf�����e���*�Z15G
�⨀�1]3-Y�咭�8?;snbl����hȅ��\`*Ƥ^f7���TK
+���e%o����q]@𔪩�i
c۽�φ���E�R5e�.�c^Ε�˹.ʆ�so�o������nS.��5C�T#u^�Vϐe�4�WgQ��K�k��a�IB��Eې�wt�s�|�,X���(��i
+( ��MeZf�C
+�m�����L�4�jE�L��%�lR�m�&es�,�е�6Ai������\\\\T�բbZ�]'S�ۆj]Oe��&�@�Ņ�r1-@��n�:��W*�>AӁ �9K�_���(:
+��_U&�,E3�����@��ЫW�
/M�R��]$\`y�R��7�)x��@�[�7M�����5�?�1m��m#��\\"����F񶄯�>	'q���JH�	񈄇1-aѷ�5����]	2r�vRI�j��~�>��/I���_�l����~�w���1N������=��Ŵ_v���?J��,�/����a]@�îL1Si���,����g�Q��i�C��&e ���:kk�ZV�����R!��Vt��6�jۊ�u3±?��ɸ���nI�'�]c���M�ngo��!6�X��I5��p2J%Uͨ�]��k�:���
+�39n�ۖ���Ÿ+~��BĆv��/��\\\\w�i��t�)��
+���g�U71K���p�޿-Т�
+Qs9z��M4'9K�L�DS^QU����sCi����~�����K��c���kCqWp{�?6�]-hW
+�E���iN:X�Ђ����7�iz<�fͽ�2�j�׸:Z��%�����ل;��jڹ�V�/�i�ˍ�+�q[.�;�<:ta�E�{�1���у�q�Y4�w�|ntdG���S�w�Oh��fK��gg�!����x�&|�;�O;��4�� ZEA�V��6<�3�c1��X�Bvç0p#���_C O���'jO�7Z�W�5�7жT�D��*:\\"�4��i�����N6}#�|�l�u�dcSp�K=��\`
+{���\\"H� �#�C�O����kH:9N���9��8&(�V��>H\\"��.g����2�� ���;C
+(��sdɓ�(�&�X��8��¾*��p�t#���K�A7LO�.=�Ћ�a��*�c1Q�w;�z-����G�x�H��z�x�t���6п�'Rj8�u���zvK��tVG>q\\"���!�א�
��]>�.J}��6�$�38O�m$��1K{�=�y'��:�,8��Bȉ���c��e��%ם��Y�����A ����U1�����9:��e
+���Q��u�n|�A�c	������W
�	��1{I�X6�Gs�t?�'ד��KU5��QƠ��DvQNʡqZ�u�x�F{���Ds�9\\\\Z!���];<:�S�T\\"B��o!�-��p}�[�S��)2Be��Tj�s���/�#�(�ct\`���\\\\�:�S���8t����S�
+��'�)��h�PK
+A����|	0org/gradle/wrapper/SystemPropertiesHandler.class�V�SU�]��!,-�
+��-�3��TR����%A(��.a�,�ݸٔ�W�~��L}���Ǚ��2c�W��ڱ��&
+$��9��s~��s�ޛ���?��\\"��Q
� ��P0�Oc
(xSNޒڔ�i3
+fh@ԏ99�-ż�T,H�;�X�R=.��r����~��{x_���&��c�����r|!:}mn~v�\\":�B�ԚvC�53�;�a&#
+㖙u4�Y��9]���aΘ�'Գ(��Vi=<e��LncE����.�Y	-��ن��^'ed��,;N��jZo�Z&����V��7�l��г��I���$u��+p2T(װ�FZ���9�H�������m�چ@�339��\\"L����?6���3�a��y��-&��dnC7�r�fW��CԡL�.�����ꋈ-V&٪,5�ٷ��}�G���ӭ�c^��^8�ȃ�1�ܸ�%���Q�P����u����45'g3��\\\\?�z����z���'t|P��x
���֙Բ)��\\"����j	�=��2��b
+�*�2�*�h߫z>g:Ɔ���V��K9#���]Q۶��͔nv�-m��ν�v^g-�*6\`Ja���#Y��\\"GAN�
+l�����-|,�����g+[�*�Dŧ�L�縥�|��+|��|+�Xyvy�)��'�1Mn�Bʶ6�w{/(���X,��(~>Wٹ�##I���=���(�D���WF��$v t�$�0;��/���~�*�x�B�D�V�\`�
+-n��|/�#�����)�����y�e�Ǥ2FIi��&�^�ʫ,=A��5��ٶ����T�m�M�fRص/}6��-Ʒ�bU	�$e�g���RevX�|�3%���_
+๡~�cg5h�O�W��-a�������.����5�T���c��O��_�	�����{�L����������P;�e���3�y��؆:�J�{�3�P�w�@����y42ES��p�~Gw�\\"03��V�;�L�M\`���q��=��4�����/��Z��>�u����\`i��N�]x�G7Y� κc�A=�#7?������	�I4�lv1�4��$ Ĩn��q��R!9K�M�-�z���9�Bԯr���W�)�5�\\"� �,����9z|�~�_=/����!�~�L�0���8�WI�H�-_���{��M
+F1�W�U>��
+�=��������Sp�L<\`��ݖ_b�qW��PK
+A�=��?-org/gradle/wrapper/WrapperConfiguration.class��mOA�g����JK�|i�
+
+\\"	HULCߐ-��H����&~*M$&�����3w�e��&3�3�������_�
��:����a�\`@E�G	xL�<�2O�<%������xN�8m��P��k����3��5���QO��M��5�)����!�Bw�~�+���1��sM�(�/;��0�/�w�^����9���sܰ���
+�n����Z�d,8t|�Z�kZM��l��ONl�ڍ�����iv<N,��n�����gJe��i_n.]�!֜4*:Z�l��k����B�j�jttW�(;\\"�v]��߳�����s�~�\\"�D�EE,�펷o�t��GU<K�1���+����}����տ�Z]�U���խ�כo�d\`���B���
o���2���da؀<��!H��)S��U ��#l6���&���W�h\\"F}����9���B�F�G;��]�3�7͟��l�)��l��0N�q�{(E[�
�y�a��f�0�?@�p\\\\��F��&z�
+�?@�v>,.�s�m���ns��=�N��N8�u�	ѽ���q$&�L*A��=HL)���
BCO*A4dF	r_
+�� s����
+�)%Ƞ2�)�Ae�E�,��	��$!�<W��j������ y
2�I� U%�5HR�@͛ 
2jf�
PK
+AG��	(org/gradle/wrapper/WrapperExecutor.class�W����-���X2lƀ�l+�ؘ��C�l�!�9Kg�@�)�����t�+m���tЙ�l7��t��g���y�;��8(�A�z�����=���_����GCxLA�*�m
+�8�@����q��2ޥ�ޭ�O(��s2ޣ\`!���{yx����I�~0����|�WO����yx6����Q&�W�<��O��ϟ��32>��X���yw���y�%^}9�����3�2�y~��Oȸ�\`;���)H��^V0�YW��^�а�;98��14���724�3��Ot
+K��Nj�-;ޞ�-#;�[��N3����}H�t	�e��]�rbb��Aqy1yp�Ȗm�G�C���N�$��*=�
+8%g�9ݲ
+=/a��z�62��9����u�Ȑ�N�l�=qԤ��1.aC�i���[Z:������k?�̝��\`i�af�Rݘi���z��oX4�֔���r��!v��S�F\`�N3M�-�1�z_arT��Q�5�c���!�2x��ݮ\\\\�)��&*����ԉ^-�ޫ�cd
+{���Z��n�!	]��$E�锞s=�'r|˝��4g�9���yJ���Y��E�
+���n�
+ts@�f�J�BU�(E�2��DK����2t!cj�'-BF�Y�&�v����\\\\�v�w�����d�L��m�z���^B<��d���)G�Go..?�n.�LƗ�a�6��z5�K�l�q
+h�8Y[�#��0H	M�(aɨ�-��W
+��vМ$����\`Pm��ެ�?}U�b��4F��s�N����V���\\\\;��/T��,P���(�H�dHW)�(�M��5�yb-٫$E;����\\"6�	���v�
+o�J�V�;�6w����T�$گ���-�T|ߡ�]�y����I�XjZ]�\\"%��)Y�6�>�6i�5�~��g#�M	��;����{,�5�;����U�kUD�
+�u=��*���$$�)�-���
^Q��I?dIe	͞P�#��1���F/Q�0��'�i?e6�!#��(莄�1��e�L�%�|�%y��,d��Kܢ\\"�|j��¡�S�Rq�m�5��U�;^�G�Q�˚h�&��}#Y܎I��7w<}�E�A��'�L�QQ�W�M��U�����ό�D��2��	}ʉx>���1COG���)7r��a�W��T��N{�R�ӓ�|88a��������AXTY����oe݂zfu����y������tR��{���:���v��:�Z��|\`G�_8檫x�8󨊣����~̕��7�:��+x��@��-I
+�:b�qJ޻q(�Kq6�۷�b��j	&�������};dm�?J�p�E����)�@aڦ��ŕf�hr%��Q���2&��x�g�lL�->lD�����M6�uF�g����ºߏ�
+C���!̣B�h�^�G��Ю
+�h�ϳ_F��~�;=�U����7Ӿ˳_�0�kZ��c��z8��Ivz���v����0ixUñp�,sϢf���a\\\\���s	oе(�C���B�b�j��J�%���%�@����,,V.�Z�X@3#�8����ꚑ�RM�\`:B���B�N�c�X@�	x�e,��^F8���8isO�[�\`I�QfQ?��b^���Ϣa���
+�I��t�V9gw��\\"3X�6;�kc�s��9['��_@c�p��
+qvC�,bW/��<�guЁE4n\\"k�����XB���e�(�ۉr�}��NLb�n�����<����pa��Kq��K���0 V�HI�8C��K���?RM��Q%ӿV��tʯ<�Z�0�hn!��{ȣ��9o(g.�nmt��rg���RH�\\"2����	�L��D�r�
+�.<�7�^�Mҫh���7�.@�#�}����\\"��l�%�4�-��p��Xn�Ŷ���%�PG
+�2k����Yu�
+�2�&\\"[�rۇ����[g��~;/@��M��d�客��T��P, Ia�UOs#�M�\\\\�#\\"t[�f8�80���HyCT�!���Hs�����c��/����օ�T�UY��<��0
ý�������������8��*C9����ݻm�ʌ=�HN@N��3XL�̈[�[�\\\\
+mRH	#SdL9<HwR�\\"����>�\\\\����ťl�
+9O��C(�.�H']��T� ��!ٞ ތīS����]��h�DL��yW�!p
+5
+���k�N�<��X�zZ*%q3a�0LQwx�|q�,8��x����?��cKQ���.-�.��\\"�c#�Lg
�d
+�_EXƙ\`-q�-z3Ai̷�D#�7�6������^��=n*����\\"�-����PK
+A�e�#gradle-wrapper-classpath.properties+(��JM.)�M/JL�I�M���**�+��M��PK
+A)gradle-wrapper-parameter-names.propertiesPK
+Aorg/gradle/cli/PK
+A��?�<S1org/gradle/cli/AbstractCommandLineConverter.class�T]oA=���\\"��~C?��R*O��h4!����aY�m\`�C��ߢ/4����2��P���a��9{�s���?�PF�@;:v
+D�c@���{xY9y�x��\\\\Yc�fs�ڑ߱V�g{m[�x�KH��[�{ʅ�'�&?��b�N��ӵKV�-��)�%��^�{������m!mQaظ������|�j�U��n���l㌟�R�{N�����}f[��C�����-��k��ږ�=,ȍ��؂ak^���߫�^t��֔���-J��_,�/]���c��t�ˡ�+;X���r��C�uVQCW�	u�h�Ca�oܠ������1a�6C���2Qľ�L��K��
+&�!9��a{	Q�23Qu�{�'�M���~rՐ���3|i153�mn�Devf���߆J����~-C�H�;\\"d�9�����edc���Dq�ָSX��\`I�w/!)��:�Fy
�7���_�|�@�8_A�#��F��VX!�K\`���R~�;�x��)�>=�N�
Rnp���؜�c�h��⟐��ϔ�4=c/�-e��
PK
+A׃��X�
+;org/gradle/cli/AbstractPropertiesCommandLineConverter.class�V[WU�N2��0�	H��Ԅ��KK�IQJ�������;L�0f���O��Z��Z_�t������A��}N.i�2Y9��}���;�v���O
�6�Q0��e|�\`�|��\`
w,�'?��
+��H����\`	�=��
+V���>�B��x�����&c��.cC���i���?]c���З1-c���i8��\\"qB[׊k�cr�Ɣ�m�e����B��h���Ћfb~��M�V�d8�i��ޞf����'��$
+F]�p�䙶�0�fv�}-QԬB\\"�9�U ёѻ���E#�0�f���f�[��-�Pv�T�4��V5�%\\\\���X3L�X����QgIW����W]�p��0�?���:���ĒVJFO���MA\`i
+Үq�����A�1\\\\W@
+��\\\\�A܊�A)5\\"ɓ�4����8,��F�h�J+g�^�z��KŽ��a�@7��e<��f͂�y\\"�߾�;D='���+�;��%��,��W��J�/G�d����L�Xg<�m�x#����x
+�*&0.�Ko '�+�A�|g��<ߡo�(\`[��b�*��Sa�����������C���%M�U�4�ܹz��%�LEu|t��g�1qBu�)���k$1����
+5����xE;i1g��Yu[s밨��D:2�KZM�u6�?Al��T'�[�'\\\\�L�z	��o�B��E�1]^����.���&�z6�K�Z6<��S+Y�h~�u.�V�8X�b��u���2��i�t�e��d��N�۾��H;�4A��?2/y/���j���~���43�1���ˀ$� ��<�g�yWjFK$���j,��
+�t��D��� �� �'R��k���$G	�}/a�N�ƫ֪�j�~�����DH���AR����� ͹?���
+�#�0,_;���iq��9|��)�[A�l �q\\"��0���%�T��
�q�Զ��9��N����R�7��3�w��o��=\\"\\\\��	�b��j��kD�����Q0����-��#Ku�s�u��Q��Ā�ٿ���c�c�ں)Q��=��[��tx�V�p�2�?�\`�'g[��:��YMᶘ��PK
+A}��yG
K1org/gradle/cli/CommandLineArgumentException.class���J1�O�3���Zm+���U�V
+\\"
+��–��i�Ff�̨������$-U�fq�{r�wO�����34K(\`˄mu
+�����=}�^DE��S�E�=.�T}.�m���Q���/
+��&���t��_��G�\\"�]�8�bl *�b&ҫ�=�\\\\�.��$����rA�^��2�(�d�[�ŀf�&՗V��2S
���o�/c�PF�	��?^E��5�.)���-��/��1ttu��yN�N�3y��+:���ԕ;XէƬJ�k�⠌u�0�ʜu�g���;�S�~��tӾ���0w3�*6��M�]�PK
+A����
g)org/gradle/cli/CommandLineConverter.class�QMK�@}���ԯ�'�\\"4
+F<6� EQ($xߦ�%��vS��<��Q�6�L
+]Xv�;����߯o�8w�upJp�L-�6�~/���S���b�f�%�u<�	�*D�<.�id���n$�b&לpW'<(a��R�\`�q��Kx��l�r?I�����OF�l��$�j�ήw����vRm_U�%J��������vJQ��?���_��F�%p}�b.�;o���-7ۉZ�3��fSm���i�M�l�g����pl��~Qqk*[9�a��#��PK
+ASf
+�g&org/gradle/cli/CommandLineOption.class�V[wUݓ��4�^��i�\\\\�\\"iB�����Z.�^����dL��0�p�w������ .�UY�����.���d:�ܤˇ��s�����N��~����&�m8'�|
�kE�Zq
o�މ�.E�
+.�A��A��w�h/��
+iEHzWœ���ª8ɉ�C^ܾ&KFA�-A6�n�
+:�����T�֍Ԝf�Jh�ӳ9�.Z��ݕ�c���沩9��s��ü��V������[y^���7�B�*�����f$�Җ�8#!Z/!����e��J��D���Y�/�����j�L+��Zj��RiCO����j.3��YLj�o8��--��ZFB˘����bq��I[��eC�_�73�Haf��˚5/΄�fZ5TKkw��t�	�+:3���NU�dz-�������k����j�괚w��(ʸ.!�a��pV�g�)�)�_C���{
+�����c.[$�k�ҿ�l��'贡�{�RS|~2�v�?����x+��bi����zkN�u#�Y� j>��2�Z��fY�T���R�Q���xu��Wx8R���E�1�0o���g�m���74���Ӂr_q9��\\\\�WO�w��/j�h��z\\"#�����z�,Zi��.Z��FkP�*؏$}��i��B+
+�c���
+na��]b���ᶂ�1��|(���2>R�1>a�ʠSz���5 ���xA�$>U�D��P~�.*8��
+����%>Ä��������;���g������+Z��Ekߌ�M'
+g�6-�0�
:��NV�ϟ=!!�{��LX\`�e2zF�I���3U�\\\\�%�N��e5CC]�Z]AၺmѸYC�Y�b�Z.+���&%�����b�\`��)�s�4�\\"((��{�j^��<�����Q�*�>\\\\����{�#�������%��N���׃\\\\��&9�I<��x����hz�\`�G4?DKyGN�!$az�Z%��V
+a	�\\"2��	��5(
,�{�����!�۹��=��V�����$�Ij�H���a�D���/�i;��a�
+�������xʐ�d��8$���TŘf�+q�Y�����r�*6�:^��]�%�׸wG\\\\�788ˉ�H��ir\`��v?/'��얪�����c�Gaf�;B'��F��|v�v��rȵ#�x=��zC�8Pc.���}�vr�c����
+JȐ�i1!�h�����]�n��G��S�����������0��� �.�j�5\\"GO���� ����
�n��J0���.b4��-��Ν�л�n=��w�\\"\`<A�F%H)$'J ^�z]�B�$��tơ�A�ҁh3�_ǔ��?:kR<M�3
+� :Ur�%�n�:����w���l��S�꛾�u���ڏ
+�Yr…��Ѷ� .�;*�ĤǪaQN\\"Z��\\\\����Շ誁�D��u!�zq�{9z���3uzYb�ֻ�U}y��e��z��\\\\��
+_�9�q�wA4�61
�Gu�M!&ְ�b����c�'s��B��J1Ϸ���P~Y�N�{Yޢ��H��PK
+A�튯��(org/gradle/cli/CommandLineParser$1.class��A
+�0E�h��
+v庈k�^�(��'��P[����\\\\x%��t���������8DbD���fs�V�	��4��ž�|�ֱ]��.	ӍΕq�.�^M\\"&̍-Eie�X�?�Ŋ0�i�6S�9v���J�R/5�-!�W�� ��_x\`�����_��$�PK
+A$f{K�	;org/gradle/cli/CommandLineParser$AfterFirstSubCommand.class�V�NQ�N)=�-PP��-���B��
+AI�߶]�B�%�E|��W�D�Jb���q�n�b[����̜o�9;3{~���� V$4#�HCTB\\"b�b�8�9�ͨ�1����� �!�#�)��J-��I��Er���+�L^�$��-Y�&UMY���b��z\\\\�Ts�a����oK�-����1�zVah�����b<��y��%���_�
+U�B���pqꥩ3�Q0Ww�EH߼�)F\\"/
+
+Y�8rT¡8��c�
+WS	C�����a��MU�8���vEJ��^�&7��r$/k�Ȫi�Z.^.�sf^�M�d#'.����n����RE�i�޶
���梼m}
+����αƬLq���!&�A�@-��U}��(3�H��2�
qW>��~�r<�a�s>��)C���0�9y�mj��V!:��|��k��\\"%����*���5&��@TZ�[AkI)����Zb�=N�ʆr2�j���
+�s���噜�(�B\`4JY:TCa��e�c��U���*�b2��v�TzCɘ�gKE�ԷN���R�9�r,m:��BM}�V���{\\"O.6��u1᳠��~�-��g~�hW���Kt/�O�vs����}�+
+��=�]h��Y��,���l$� ���֊����7�� �4O?��	��gԻ�
+����h;_��!��Ѹwi���P����CEӞEV�h\`l�l	�,�[��m'GT&p�DA�n��E
����!i�/8<~��[$�\\"���V��8z��b3%���+�>g�*h�/V!r'����e���m3=�:Ir��n	w���N�0�!�؊u�2�a����I��PK
+A�D��&3org/gradle/cli/CommandLineParser$AfterOptions.class��mOA��{-�r-�� >W�+p��\\"�D�!$M�Fxa��g9������.��D%����2�^�rҒc������ffwn��׷fqۀ�Qi�u�4��h �IS�tL�a�T�z��j�6�Pɓ5�&yյ���XO�l�ե}���G8�]���x��2Crɫ<�+��M[>�.YN��
+w�\\\\:J�I�i0d��m���xB��B�r�卆M�u0r$f����u�~�^����F����+��[.5k՗��-�o0$�����z<A�e�k�ͨ��S
+�b���V���g<��?�d��\`�Sm��t\\\\cX>��cg�>�v��@]7|�-ƪ�-+�CG��@�ϔ�0��j��E77�c�k��މW7xؒ�1��f�0�0y�d�8��3��5��?U�Ѷ=�
+q~:5�h�h�k�mq�����_�2w��C^�2
+�\\\\��
+�G@�I]�T�����G�i4gL��,~Ab�T
+�4�\\"A;�����\`ȑm��<N����~��B�hV^Z�c��\\"؋Ck14���82����w$׋�g$T�]�+
��tm
s!PI�I�H��K!z1��P��W��}��V��̉�j��F��W�_y��G�O��=���E2L�8)Ǧ�+2	v^��L�'��>�:C�٤��3q�����hb�oPK
+A��M�u<org/gradle/cli/CommandLineParser$BeforeFirstSubCommand.class�V�r�T���串�:�I ��I|�sk��iK�^���r�ը���,Ӿ��[��2����x�Hnb�N�0��Ϲ�ٳ���=���_~0��2Nc�
+K2��ȑ�!aYF�ø����
+ǪP�&C�u�!��%�6>�1�u���(68
+w��o�z|�a,oٕL�V��zF��5�VS���a�wU���9�^6Lù�ps�_�u
+W�ݢ���d�֬m��l4jeݾ���$��-M�n��!�M�$�2��-[�a�u��(7m2(�MS�תj���ڢ/�xWCiX;P�BNg,�YtT�)<v����a�[{���![[��G�j����Lѱ
+���L�C�M��]�uأog��D���h[h�fzu�ox���B��Q������sG}�~\\\\�\\"���+�f��<�ì���c��V��(gDBw�L��ň�a��ǐ>���}����3%l1���T��3,�z�o���Kf�=�H�9�	T_1$w�bW5�t�?��f�k��5s$]%���������4C� Y�G��p|�@EYx�.���~H@���]*�[q���r�j��;�;�k�G柮G&��İ�SE��Qɪ���z|q��|�y���p�j���(m�j�a8�
+�˔Ww[E���^lq��6v����(=��WN#�#�rN�YS���.8��~��rW��ß��������K�*b�;
+Q��\\"Q�iD@�r0�M�[�Ҭ$�?!�H�v���
�C�Iq����f�.Ɇ��1J�ᮨ�����oZ�}4�{�J��E�F�G��?�3x/�J#����'�Gtr)I�p���g{(EOJ��T)�.>Gd�/�-�G�WZo=sP�#�\`K3�Q��[F�]F�]��pՅ���ڇ�b�Y��h@�~R	���(�!�ijJ3n�����8B�# g��HW���ܱ���a6�:Nx*��9��g\\\\��.{b���׹�ڸ��i^E��\`�� N�$��,���S�D���gq����c)�/h�R��PK
+A�*�ZM�Forg/gradle/cli/CommandLineParser$CaseInsensitiveStringComparator.class�S]OA=w��P�Rˇ�\\"�UhAx1���ML�ԏ������v��n�����/��\`|������Ek�C���9��{Ng?���&6�Q)\`�,9�5�=K&�l�fc��*!��|m2��]B�t%a��|�|�ߓzG�y�)����v�V�&��+�\\"�M?�~�\\"u$ۑV~���Q�	N���nx\\"%<i�����z��x�el_�]���Сԕ�u�݉O<��r�@	�~�M���L��5�a����]o�����'�ۑ�~&S�纽�;���>��6m܏�#�nԍ�֛uB�_Є���\\"�[�f)����ְ�m�*����ȧ�H�j�f�p��\\\\�p	�ߩLb������s� ��E����\\"L��d'h��@Kӟ0}��1/d�MXE�n���qsYX�'>9|r9�\\\\�=�w��P�5o���y�$L�̑��i�ft�cye��������}������l�y:E����1k-�LY�n3q�2����\\\\�u�M&:���c�#����2���Oȭ���㿈(&�J\`�R����
�؁�p6k�0��,���X��\\\\����*w��M/��PK
+A|�R��&=org/gradle/cli/CommandLineParser$KnownOptionParserState.class�X�wU��6ͤ�
K�*EqD�t��;VkE��E�+.ɐ�3uf҂�HQpCq<R��z�����7x8�3��mi�����w��%����Z�z�%�
wK�GF)6�D�e#/q^�茺IB2�
	��E�,�[���\`�&,F�Q�{�Ӗ�ʨ�p#2b�*c���e܌��b��
+܂�yyD£|�_?^�'�]“L����%<#�XC�a���m�I	�d�}v��nw�4����.�N�$m-��[�)�����D�a�7i��ۋ'�_)�%,:
+�OC����'\\"1��H�Wsu	���B/���:
�U�Ri���k�6���]#��e8.ݕ�ISs�61^<�z�����dK\`w�[i���&p�~�^+�⎙��
+}�+A֝�(=����}��1E��.+���4���rrU��1}�&y���
+&%�ɖ�n'Ӄ��
+\\\\[��ކ��6�e�U��E��-��P\`�l��f�=�V�TXZ?c����{���,)�o��3�(�R:{��K9�\\\\����A�(C^83�y�� +$� a��~���\\\\q�e^^�l]��2^ZyY��
+��ip ��Zi;�_op\`��p�9\\\\��������v�ֶq���K
+.�e
+�hVЂ�
+��U�r\\\\��F���Z�L��׃�.��Rt��]R�[�ԩ	KwT�rUWۢ���f���ZS.y�nܬ�I���
+��K���-���T��!w[�L�uȶ����P7Y�?��f	�)؃Q]�T�k��5������
+ǡ\\\\��LZ���p�yq���DQ�񦄷��w���
+�=�s$ں�)נ˲v��֧�� >P�![�>��u�\\\\|���I�\\\\@-V<
+���g�Z�Y͓���5ͨ-4Τ�j�ת�
+窬��m͵l��Z�n����pi
+S�5꿗�$뻦
+�b^�)��S��t<Y���'��%S�3bhTшhO���씠�*�*��Ӧ�o���i��3i�Z<�;��e+�R��L)�ɩF�e=��i�<����Ϫ�a}��IǸ�eR(���_U}C��&�Ls�������Ię�&Ҁ��{�D��vv}C~Z���ܣA!��m+=���4�3�{���&
�����l�-9]�2��J�8��L�x�ѩ����Ӡ�v�u�NsTOt.��J� Wd'��)��6*��$z��G:��h����#��MG��'\`�a�G�!
b/��T��1O�����X\\"��Մ���kp-��XS�X���ږz'�7D��.��-��X=�1�{��*����7��_��ޯ0�(��.6������k:���QU�u�h�!�X�YQCހx�8@���Zqm�Ct��<�}�Yz�
+דn��B��|:m7x�KH�4��G1�%��s0�Y�P��^>��d%f���sT�CP��\`�g^��
+���t	����H�@�'�؄N�r�\\"
#��^h���N�oGQ7AUߑ�t$��YFRk�|����y�aC�@��g���pP����n'�I�<:\\\\(�=�Ě�p�����,���᝛���a����ұ<��V��8�o�ST�=�G����K��Q���~�q�;~�Wq��W�|����\\\\����T���۰kqS����'��'Q.ᖿQs�w8�Th���DL)� Gc�M�CG!O	�+�m>V6�d�����hd��F��^��w�����މ&�
+a�ࠑ�W�~q���p�N߽̾2BI� 
+�7���!�?PK
+A$ľ���<org/gradle/cli/CommandLineParser$MissingOptionArgState.class��mO�P��w��*��LD��
+�!�	·'�\`0�W�̚�o;��o���B��~?��ܶ�
K˒��s~�퟿�~�Œ�r:��'I*(uZG
+7�ٌ��q��eМ-�rD��_��K.]S�z�3��B��js�5]���#ņ�u�,n�V��4�\\\\�k�0��#�%�r��w�����[c�U�:�3�WZ�
+S��6���9��^��Rzx��Z���s�u-��˲V��;���TJ��?n��I/�GQ��w|�m.�UO��Rn�!�eC�w�&à# ֻ �@��~�+���:0��r��\`��#:L�:՞ͭ�1�𦯉��)�[�PR�2��q\\\\�U�%7�ǖڒ�#63���V��t�20�1,��K�\`<�E�����a�$�e�=y&z��a��	������io٦
+Sʞx[t���)<�L/gd�핤�=Ij$i��	��0iOH��*���~\\"�Cj��A�Q���{�I�����gI�/),��9��������}k�4������
+�q��Ж��g�2�\`���(L�B�~���e�6n0�)I')B�e���{a�I�㇡�;rL���v�\\\\
+Q_Q�����ӕ;������0��AS�B�e4h��Ρd�v6l�o����_є��	�h8%1�+a��U��' ��PK
+ATK>��=org/gradle/cli/CommandLineParser$OptionAwareParserState.class�U�n�@=��q�$�6\\\\�%�)M�K�@)�p)E� E*o��Į��O�x�
$
+�J|��Mݒ*A./ޝ���gf퟿��PĽ8ȩ�0*w�Tz���c\\\\��	�*L+(��cVAQ�u���4�ܮ�,�dȖQ/��5̂Ѱ
+O�p����C�{i����\\\\����e˶�;���\`��
+CdթQ�I��h5��xƫ
+���7*\\\\X����.C�ɶg9���Z��ŵu�6�j���I���,s���]SM��j�%�}�P����녲',��4��!�E]&���8��c$�\${�]p�G�짍���o�R�NK�%�t��i��!���Ә�ЏSnbX���[XP��a	�s�����L�f	�+��~�a��[��f�:�~���Z�)9h��O�S������c�s��m�q�r��	|�������F���dU���ԩ��0L�����-=ƽ���_��qk�ޥvr�l0.��ϥF��|���x��!��J�Ӛ�'v�t�!}r�O�Y�Y��,T6�$�a�|i��Z�����̋dKTT���ȇC�(���<�C�(.��.#��젯�*�&�>Z�7D�!�eSZ2B���#����o��o+5U���c���Cݢ�{��
+B��*^�v�#8G�Ni$�y6���+���1E�8�3$r�]��oPK
+A�%�̻�7org/gradle/cli/CommandLineParser$OptionComparator.class�TmO�P~���Q:�
+���
+�2@�.�,Y�d�ďe4��kI��?�/~
#���ƨ_��
+N6).]��}�s�=��~����E�%d0#����0+bN�U�J\\"E,IHs;�'\\"V8|U�Sk\\"�z6L��7�e�A(;í�i;�����-�V��n�����)��L�!�{䛎]v�G����� Wl�p˖�y!����P�~\`j�2U�6u���y����N_���z\`Q�W�k�H-�T��	��T|�%|���4y�\`�P?�UK�j�wM���k��w����uz��-�֤��$�/0L���[3��xѪ��M�7-�O�7��I�R�i�u��;?ڑ~�S��b@�����Z�a��B���h�Ο�\\\\��i���a+6eY�����g��љ{\\"!c/&��q�����v�a�[�h��ǂZ�0�0	}��mj��]{���a�=�eўB�$�>��P���}�4�s2�|=ѧ��Q*t�e躣K�.@
	>rd
+���d$S3gH|$%�!z�p'��a����!�x���D�\\"�2{��9����O蹀�S�p��Hs�wnL8�tr��I\\"��!�y�3Ⱥ2GY�v�����>i<2����<l�4!�M�{�n�V������
+��#f�dY��\\"�5���>�{}FC��NS��#ZO�q�ϣH�INQ�2(R�8��˦�S�<�i���
+PK
+A�fC��
�8org/gradle/cli/CommandLineParser$OptionParserState.class���JAƿ�Y����4ն֨
��JoJ�P����H.��$�:���ى�
+}�/�}��3����4�ߙ���Μ�����#�B���F��UB�Xie?
+���o�}IXl)-O���4碛pf���D�F��8��K��ή�J�a2i�VX�T���4�Dd�d��Vj�(6��Ȩ����B�]�Q]��AXH5�ƞ�[���
��O���&��B�T3k8��N�+q#�D�8j[�tܘ��K�Md�T�̋�W^'��ۄ��d���[�w{H������ӡ�ɯ�m���s��+a�;����@(?^�Y�J�x���\\\\a{�(��$�_��ׇ{���L |�X�uf��fs'�'�8.���ygX�u+���e��/;�����������0���:^�eor�[n��}�y?�\\"k�����g�PK
+A���E��3org/gradle/cli/CommandLineParser$OptionString.class�T�NA��z��q�ZDQ��G�Qğ kL�&(�[��rx�k�����/$�&>��qv[l�B�����|��������'�9<�E?L�Ĵ�4�B-�0��,
+�:4�(1��m�;�ᮆ{	�����#�<�׬�8t��COЈ���͢���T�ݯ�RXgP+A�aXv}ge���o���L�ͽu�Bo�xˍ�U��	C��wŠǣȡSk9kV-�Uϱlϵ*A����H񚇑�N�S
�?s���?��:幘/t*�-���W�!�h�ϐ��汆/�Tww~e��Ӭe!�rg�c���DQ�<?K��9�ѱp}-�	m�+�0܆0#B\\\\@�@�B<40�1/�,\`�a�ܧ;�WuB��d�:�9_�����s�f���_��v�����k�{��E��(�a�s�-���-��+�
+ǯ�Nm�V����nD0N�/MOW�vR/i�-�5)m���J�i	Z�C$��}�fqlO��0\`�z��^�@��&�x3#�ȝH��N$RhO�h���,�ߠf������6�j/�-пb�����.�'$���4��h�x\\\\��e�F&&�E��E�pL�0v��k\\"'��M����F+x��ٜ.B�;��2�l�7D�D�!nʆ�]�HdR���6fT�nG�#fZA^�F�|�\\\\�N3�_&�PK
+AgAq��x=org/gradle/cli/CommandLineParser$OptionStringComparator.class�T�OA�fvۅe�*Z@��Rd) ��H�&ULjH�6�MY\\\\v�����ɛ�^�@��ѫ�1�ٮ(���y?����uf�|{��\\"Vt�cF�.
+y
+�:T��呆y�M�԰��Đ\\\\�];�\`P�]���[C5۵����,���s(3\\\\����-�8��v���9mϭ���6+�ѱ�E��F�u-�� ��V�����žc�
+�6	{$�}�����]_�̠5�����k��D��p�fY���tƋ��$�.���\\"�x~H8��G@�T=�WO�q<��;{�V#,wg
+U
+��簥����^\`�����n7]���b�
+m��)�z��TJ�{-�am�r�LW�yyȀ���%,kx̰ٓcEV�
+,7�C���=�㤁Qdҿ�fX��t�XG,����b���O�%q,�Dφn�d�3X�w��a�^�
+.��h�\\"�,#���G��I��
+��n\`�,��ć?C�<�U<��������l�����S����=��)j����\\"��m*�D���
�� O\\"�5L�>乎�OE��;McBһ���-�!��%��.��\\"�{��N'�M��zz����Y%�B65[�m�~��k�E�T�BZƓq�5�<�]/h����}LѾ�>�����M�c��G
��MHx���)����PK
+A\`M~U�2org/gradle/cli/CommandLineParser$ParserState.class�S�o�P�N)s���97ս�&ML�f����.а.���vF�'_|����(�-�� A���G����������mdQ��C-��6�xba�B��{�I/zI�4����\\\\�jϓ���d�b�s����?���4iF�^H(�*tU?'��tU�a���v/Pcg���w���9�\`2r�;$u�Ty�P��/�#}��@��3�I8��c�)O�;�B�/ ��Z������&���Wt��i2���qf�YC!�����z�<K�)�)�9��K�i,�y��Gm|~J���\`��s5t�z��7f0m=M���*l�[ZE�la����l<ڿ�
+��aD8X~����4K��g��hx����\\"�ʿV��\`��p�#�-������6?s:I%�/&����JP��*l�W��U�|����ZL��@�ػ�5��NL|��'ܻT׊c��+�J)����)�O��5�c��Rz��z�x��qY5�?�M����m��6Wl�6�-
+/��PK
+Ap�X
+�k?org/gradle/cli/CommandLineParser$UnknownOptionParserState.class�U�RQ=w�I�0@�(I������*
+�BY��$Sqt2CM&�/�/.��G�?��_7n��/XvO�B�P!.�t�۷�龧o&��}\`
+�5Đ�І�6Z��ɱ���I�R����5
��Iψ�@�#�
+w���6�%K��FY\`|�q���+���[fn�)��]X6m�����	��[H,?�/dΒv1�깦]����
V\`�0��S��'Hd޴MoA�HelN�Z��5��S��8e�R�0��r�2�FN^Zk�5y��S�D�b?�����M�t��<Aǁ���Eû/ˋn�R2l��M��)�ؔ�z+Ɩ��rO�ҭ�Is��;
+�m�1&k|DNٛ��OlV���^��I����I6Sl��O�k�:7o�3y��#9�|G=�esSG�:��С�S����1�[QЛ���!0���� �mEd��6J\`$u�a6{�P���rMZ��5z�
+���� }��KB�B����4%�(<>Pڕh&ߗ�P2��e��g�v�nӁ�$�$T@|�*>A��%��W|�):�T	Џ3����_qI�_q3!��Ź�t�<g)�׵:��o>�^=
+x�c @����C��!��:�Z_ e��Y��q�>8YM��H�E�F��w@�@9\\\\\\"��!�v�C��z��1���v񫮥x��&҃�k�$}ˌf��!�u����Tsj]�p9�9�+��1��:�*�4�*4fE�!�������./1Y������?PK
+A�=l)&org/gradle/cli/CommandLineParser.class�Yi\`\\\\ő�J��7zz�eٲ=\`l��1���S>K6����Xz�Fψ��8B����\`�\`���d��M�����Ͳaك=�
+!l��~�ޛ�����PwOwUuUu���O�{��Y�T:�j�W5�ױ�h��/>��)��s�3
+���O��
+>ס�y�R�a#��|��|��1�ׄW��%G���ģc�x��S�5��E��]��%_���fF�eu���֤P�t|e�&cu�����q��8&�&���䞬��JO��|</���&�u�H�&��+S4���4�e��Z9MQ�ФD�bzAJuԩ�)Ӥ\\\\�r%�m��
+zE*�J�_��.3Us�.��5��ɜ|������\\\\5������|���,T�i�XG3��H�xʬf��R�,Sv-ױUV��Y~9[y�]�e�.��*�4P��4�Z���<��V�&�Q���e�\`<n��Vw%B�HS\\"��/���
+Ƃ�hL�u��˂q�>7#�P\\"t��M$(�����L8?�=���cq3֔&LM�s�sO��A0�e�AQC(���j]��Z�-um	3f��5i��f�
+�≦�m�kG0�J
KͶh�̚�dc�
u;�13c�M������0�[�1�׬�_ݸ���a��5u�֭X�(��^��N���1���U�&��V���QQ[٥=I�Ҩ�]��k
+�G���-\\\\�����Fګm
�WEc����\`kجn	���V�\\"����E�9:Gw6�v������1�|�yqe�41���P<�-l҉��H(�H�[R�s�,���J��ؽc�[����-���\`,�~;��DG���|�������K�g�lloi���5M%���9.b�I+v�����\\"�[�FU��R�o;�R��\`��FN��3#��mL=� ��4�P�%$�l���u��
+*	c�Late+�r\\"n���uUC��iظ̀��J���]B\\\\�
+k���X5�P�j���:��)B�p(^H�i%����n	Z��kn��ݒ��_�>N����
+��&3A�32gR4��d��Z�8?l�y�O����
m'�ˆf@��h�Ռ%sƞU�u��6��3iʭ
+ŕ������%�p77���DL�^a�E��9͚V\\\\�EW
+�p� vX8�)��4iFf(M�a��}��.��l?�F�,�N@6��7�w�3���§�E�5�F�pJ�-���f�n1�R^��:�t[���B�Y��ԙd��3���R÷���M΄A-�V�vm�ϼ�.(S�Y�n�Z�Q_;�S��[Z�x|ڜ�3�K�F�R^�9�fp�U�g�sPY�1O��/ �}��M��Xk#���I�Rr܊[܀
+ܬF���D��-�	�;��&-���i�{�OP<����1�Mڹ�t���\\\\͐׍ku��;5�nHXv��!]r1%���	�0��Ґ�t*��1��T]Bح��t��-�씸!��ǐK�2C.�+%���ª2C�!W*�or�\\\\Mx��ղZ�m��U�3W����q�\\\\��lE,�r�Rz���[U���V�3�[r�!7(G�(Wr�|ې��jCn���*��%*��Ų!��wYX�����2�u]�4y��ӇY
+<'�k�P͝��%w'�t�3��lu�Y9L�ُC�'�d�R�{23$*�
+��0d�\\\\/�!{�^C�/�hr��7��ܟŞkCP���Ɉ:

+��\\\\lȃ���nяE��b�\`��*�ƹc�&{�>Vi%��=f	ٽ�wb��eic�^<cz|Fq(^��\`kOq+�ڈ�Z����r�#��D�B��\`$M[[��i�A�F�3-6M<�%�w��3*gT���䧆<*�i�3�Q��aJ,�F�=�-�H\\"�PѮ�\`���B-�-<��X������3��2\`����qC�+E&�l^|����”{ŦԨr떲RC��'��!c�%��!��|>�Rĉ^�Éw�w�\`����O�F�3<,�dn>g?�_�y2��|�����%�
+��z�X�>\\"�Nd1�V�f�Y72�pLb�h1s}���6=�Jq����Ŵ�*��9���DuX�U���ǻ?���}e������[�ւeN(��q�%�B=�:��FsW����z��~�-)u+Zv{���p,�|������{���\`8�E�<	�r�_n��۷�C�c^�{[܉բ�z�v�
+�46���<[]�k�t6SN��o��;:������ԃ�C���qֻ��[�c��\`���|ݽ��(~�zv��V�7\\\\e���\\"�z����>��L��P_�k���p�6#�+L��h�1I\`�E�4c��/�]A�in��ع��<��hw׆�ڧ0=�՗g3�Nj'\\"�@#y�Yk>nV�0=t�zi��H_�����r3�%?~u�'�\\\\����v��B��
+A���7��o}m�h��~��
+�ǡ�W���s�	
��_&�%�@,y�����ő�<ހ�M��<�k�����֭�0nGRZ՞�A<[1�Q; hK�&§i13|d�7�L�]$7$�J����A�h5㡘ٚz=�����贞�_��.��q*:��'�����F��&k�m��l�oU}���������w�kr9�r�
x���m>�3�y�⼃�����N��w�n�W�})����m^Y�Ah���O	�YL+,
�l\\"G�����˱�����7<���7hb>�x�������i��!_p�
�h����
+9�Q��}(����a�\`���F���˜Zoe�ۋ��局����v�����}r��8i7N\\"e�K�{1�����\\\\N�IAU�[���k|6e)�������=�Lg�i��t�E��:���Rt����=(\\"�4R�A~?��(N{�,$��)��>�ȡ��)Y>gGK;��Ȯ�,J͡���%TZX֋rE\\\\ދ
+�O�����܍€?i.U�Mj���[�W��\\\\V� ��*�Rv��\\"uG��Y�xm��;��>,�.�����Ӈ�K�֑�l�wlfe/N��oE���'Q��<L\`LE�+q>��b����Wb#�\`cm3�<���؊_�\\"�K���
+����*#\`�x��)h�btH):�Ll�&�evH'�҅.��M��^��Q�~;�9��˸T��7�C\\\\)�5���?�z9�sr��*��h���p?ۻ0��=�Q֜F�{���tw���t�c1~D�<j��Z�s�<gT�W)�!r|���i٧��9��Y��ȫ�)�}�Ə�q�#<��07����)5��c�t��~���Y��c(א��j
+��\`��1ųg�?�������]G��a,:�h�����ô,���	���S��B
+���r��g�ЭT��4�3�+�\\"d��;(�NW16��E���k�۬��f5�7V����x��E���E�Y���dN���>����k����U�a����!��t0�F!SE/��w����X��S��'�M��d_ø8�缁羑g���M�'��9����K�(=SX�-,�3��,-N��=��u�S�9�P�i�����
+���Q��c\\"���%��p;°��s��\`q��x<����6V�����~,���z*-w�����F�G|��:%f)�XJ�X���BV4[J^ ϑ�^�l��T{����
+��p�����������g�9܅*�+�/#ߒ�Z�JNxy
���*���uìR6+�|*,�&����V�U�V}
+5^Ƈbi�ҕbY��Ї5������y����\\\\��$h��:4�\\"i��4��h��p�m�7����H����8���T^��R��x	0�K%��k��A�g�鵓r7s�~��!��o_����
��ǜ9�\`9����_K_��$��,�+��J;~);�܆��%�!��My�xw���#){9�%�q�G���2wR�����0
+/r5�{���,�5����q�BH��\\\\�����
+�d^p�K��PΓ�7x�Y���+��b�܋7X:y���x�Y絲F园ɯS��-1����8g��O��{zSe�
+y�Nv��a��\`�aZ�x���
+5��m��C�d\\"�QL��tL�q:ɛ�
+e�c%,3w����]}s����S�}���~e?�2<��_��p媲>lJ��0ݩ�j���A^�i�
+uoQ��E������pê8�~?��oS�w/��-�Oijw�g��޶K�/����U��G�y�^�}�B�����,�ZJ��,;����;ɢ����x�b��f9�r���K�a�2�J|ߋs�=ijS�8T�PqhQn���sʃ�YQ�U�@��O�~lm.��I=o�A\`�2/-�����'a*o���}�CӑMs��wō��iV��
�*,�K�:&U�@�c��Hb�{V5�ky��E=�!��#�&�P�==�	k�Oц?�r�]�?1�>g�A���y{8u
+c�a�*^����H�*�R��!�V��g��-y�h��.�#�f�N>��_�{EV43$������f�f�N�8�Ѭ����;��l��d�O��sN����]w�a������i��
+;{���g<�Oaja� v<s�[��G�%.�X\\"���\\"�QkGOa�X�g\\\\�p�����>�>����.a���.�=������dz����A�#�_�������;q
+�e�V)^���?PK
+A��>�&org/gradle/cli/ParsedCommandLine.class�Wiwg~F���ċ�%v�TMc[����R����8�S���)-L���T�(����.Ph١li�7	��\`rX���;��Ɵ�����}g$Kָ1G�����}����.3�ǽ?��
�.�v�*��\`�!��*��΢ .��bu�f��T���,.+*�W�BM0#h�'��\\".��T=^��a�����}:�|F�kt�����0^�7�����/�㋸$�__V�0�A�V���Ma�
+q������[
+ͼ�1s�#+3��ɥ����/�E;�����
+�f2�n-C���#�2�����i�Җ�������U0R��Ғ�KMfr�)y��(��Q0r��*T>c�4y�Z�q���%s�H���˶��Y���h������M�-�C#�\\\\�U��08a�~.k��*��)Cx��K��)�LAt�\\\\г���kWY�p�#�A͙
+����	FA|���W�ݳw�/뀽�)x����V5KԶx����:ԕ|)���#�wOP�c���c�I(�V��^y���U�6K������bѴ��\\\\j������3Tp�UG(���|�V�Q��H1�M� 7S8��
+�RΊ|{��Y�#۶���nQ/���5^k�Ko�u�O;=F��m,�R���h�q3�5$�bwc�LO�F�ܙm��
+�����L���n\\"�����9m�G7M�h�z*gJw�r�v詔D�ճEc�Y��e�y�K�?�a{���?�՜qZ:��fy���ȌY��c��m5�����
+	� �^Xd�k�����ޏဂ6��Y��\\"��
|P�[x[�w�=
+�����1s�=>4�?R�c��f�U�D�O�3��8�*$c�/GW���*�S�.��5�“~�U�n��
+|ɘ�_��=�0�a�4�
+WU\\\\�0��~��p�WL�HZϖ�:zy�py�����*��r�K�}j��c���븪�����֒[���v.��2}Ri����c9SV�U�P�P�IΝir+���9�������g�S��
+����Q��Z�y��ۇ��OB�MkI'ƠG�>�� �=�7r���W=¶~��̜�gD��1[�f(O:��6y��P=𸟳J8�J�e������2m�sQ��P0����-^^��Ц5[����y?�A�C�2?Tj�H܆����m�o\\"@1H1t��XG1r�}k�L%װC���Р�h���&�4�o!��;��]LHҰe(��=���Z��[]����;7d���?��k'W���o������A�؅속=x�5��:I�C�a�
�b!Z�cx�(D��p1�')�1��a���8���!�N��*�*&T���=t�hT�����_�P;�=�'��X����/�����	F���Ι���bX�@�u	#Bw�v�p��\\\\�}b�9�û��x?}�d����������T�}HH.���o!���s��y�V�����O��C��I�/�a$�q�a�x�A1c���x��)R_J@{�& (�+�}�?Av��3x��G��f����97
���CTE�B��\\"���]t���F��.�'���ޜ軅؜��t<�õ2�i ��1�i����_3�%����6�
+;Aؓ����q��6�
A-��V4Rg��Z�l�G� ����o��rN�$�g��dy�E:��+����N:$��̕��ų�xU��'\\\\�5��B%ǻ6
+Z�3�]^ᜐ��k��>�l�J�
+;�k>��e�'*�6z��E�Ge�)��A�<�],;[���S;\\\\��O��r=l8>Y ��߀��^��9ي�	��NL��vcz�ͭ&@S܇��Қg\\\\�H�VvWc��.��97�{�X�Ř�㰗G�o�� )�ȑ�,�I8�s��Q�HI0��$Ab�s��9��{�\`_i�*^QUt�
+	�
+���������9%�<'�t�E�B^�K��r�vs?��\`��A�^EAEXP	QP
+�dȹ�
PK
+Ay�t�E,org/gradle/cli/ParsedCommandLineOption.class�S]O�@=ݯ�G�e�Pa�eQ���
\\"�hHV1Y���awR������l���I�g��N[\`Y$�ә�{�=����?��“4�(��H#�b
+���冊�$�4���-L%q[�器+��r��⾊
+[�lpWA��ɶ���������(H��a1��p#-�g���,C/{����9*I�
+Kxs
+���U�E�J�%a��:w^�u�\\"��]a�*s�<����!�I�d;�n8�jr�b
+�s\\\\^]�k5fU%�J��E��V�݅���=Vy������
+j�;*i=z&x���V�Q㖧��p6K:�d�)��Kn07T@��U�.�
+�Ÿ	�v��ICzt��]p�-)k�DN�(��t]6Mn0�,����
+��(#�Wm��-��o�-�g�v޿��Ѱ��f0��?L'��Z��D��A�K��@�϶*���$����)���M^!�O���+v�i���Q,7_�������Z~����]�սm\\\\�(K?
+L�H�.:EЍ8��rZ/PdQ�
��>��!\\"k��~E쳟}�V�_�*bT�G;-��%����b�X��o�������������\\"��p�(=@&�_���2�w�%��^*��$�A�P�PS��� =1D:��!䉩��If�%�ޱ��n���0�5W(v��b�RD
+�$��
�\\"x�j�2D�ϧ��xr7�k>
+��!��V.p�]�.��G��ӱ��D�\\\\��8\\"�y	R����PK
+A\\\\v�B|
:org/gradle/cli/ProjectPropertiesCommandLineConverter.class��KO�@��D|?P��u�#Q�+�$�C;�1m�	�JW&.�
�(��1�D�,��9��v�o�/���[@yl汕G)��v�
+}FHWkw�LS����!�]�nY�7�ZK:̿cJD�����ZRy����s���V�;�H�+-��)���n�kS�#cruLX��gh|��B���j���F��Y���D��Ώ�%�L��%���񎅎*�_���?�ֈ:(\\"�<�ڄbJՍ�	��؊t�f�^*K���
+ߵ�
+XU��V����i01�k
+���p8��wZ��8T0g�?P�a��m����=���C
+S�s��
��|	�1\\\\���Z�q-}C�_�J��Eˉ�j��E+	��w'��PK
+A
+�8=|
�9org/gradle/cli/SystemPropertiesCommandLineConverter.class���J�@��ثm���j�E�5BPą�R/P�~�ӑ$&�B�JW���'i�A�Y�3���͜����
�
l� �\\"l�Y��l�E �<&�	d���@���H��g�L��{:r�R�s�:C*X4NĬ����Q�۴;hZ3a ѽ�G!]��G�v�7S\\"�5eb
+o}ɸG�����tFM�z�9��y���~X{()spL\`7e.�KV,
+�TXxɢ����fDT�E�G��P�W��
Jm�h~���49A�jx��Ѱ
+��s�h��
+gԙ�n8��5��]�.F�Ԓ�s�9��Q��΢��*�s�/@�Ug	J*�c�e+s��+1�
+��$p�����6���/t-�,�;�h-�.�Z
+�>k�Z�PK

+A	�AMETA-INF/PK

+Am�>=@?��)META-INF/MANIFEST.MFPK

+A�A�org/PK

+A�A�org/gradle/PK

+A�A�org/gradle/wrapper/PK

+A�%Ӧ�
/��
org/gradle/wrapper/BootstrapMainStarter$1.classPK

+Ai
,�$
+-��#org/gradle/wrapper/BootstrapMainStarter.classPK

+AhQ�}��#���org/gradle/wrapper/Download$1.classPK

+Ay�[�4�A��p	org/gradle/wrapper/Download$DefaultDownloadProgressListener.classPK

+A���ۡ~4��org/gradle/wrapper/Download$ProxyAuthenticator.classPK

+A�pO�)�&!���org/gradle/wrapper/Download.classPK

+Ay�L���1��^$org/gradle/wrapper/DownloadProgressListener.classPK

+A!9|��3��N%org/gradle/wrapper/ExclusiveFileAccessManager.classPK

+A��,y�-��U,org/gradle/wrapper/GradleUserHomeLookup.classPK

+APr���	-*��/org/gradle/wrapper/GradleWrapperMain.classPK

+A����\\"��9org/gradle/wrapper/IDownload.classPK

+A9l�V�\\"���9org/gradle/wrapper/Install$1.classPK

+A�gh�|-���Borg/gradle/wrapper/Install$InstallCheck.classPK

+A^�,�C- ��SEorg/gradle/wrapper/Install.classPK

+A�:�o4��2Zorg/gradle/wrapper/Logger.classPK

+A�\`��
�8���\\\\org/gradle/wrapper/PathAssembler$LocalDistribution.classPK

+A��;+&���^org/gradle/wrapper/PathAssembler.classPK

+A����|	0��
+forg/gradle/wrapper/SystemPropertiesHandler.classPK

+A�=��?-��korg/gradle/wrapper/WrapperConfiguration.classPK

+AG��	(��norg/gradle/wrapper/WrapperExecutor.classPK

+A�e�#��pwgradle-wrapper-classpath.propertiesPK

+A)���wgradle-wrapper-parameter-names.propertiesPK

+A�Axorg/gradle/cli/PK

+A��?�<S1��Hxorg/gradle/cli/AbstractCommandLineConverter.classPK

+A׃��X�
+;���zorg/gradle/cli/AbstractPropertiesCommandLineConverter.classPK

+A}��yG
K1���org/gradle/cli/CommandLineArgumentException.classPK

+A����
g)���org/gradle/cli/CommandLineConverter.classPK

+ASf
+�g&��z�org/gradle/cli/CommandLineOption.classPK

+A�튯��(����org/gradle/cli/CommandLineParser$1.classPK

+A$f{K�	;����org/gradle/cli/CommandLineParser$AfterFirstSubCommand.classPK

+A�D��&3��O�org/gradle/cli/CommandLineParser$AfterOptions.classPK

+A��M�u<��B�org/gradle/cli/CommandLineParser$BeforeFirstSubCommand.classPK

+A�*�ZM�F����org/gradle/cli/CommandLineParser$CaseInsensitiveStringComparator.classPK

+A|�R��&=��I�org/gradle/cli/CommandLineParser$KnownOptionParserState.classPK

+A$ľ���<��t�org/gradle/cli/CommandLineParser$MissingOptionArgState.classPK

+ATK>��=��s�org/gradle/cli/CommandLineParser$OptionAwareParserState.classPK

+A�%�̻�7��x�org/gradle/cli/CommandLineParser$OptionComparator.classPK

+A�fC��
�8����org/gradle/cli/CommandLineParser$OptionParserState.classPK

+A���E��3����org/gradle/cli/CommandLineParser$OptionString.classPK

+AgAq��x=����org/gradle/cli/CommandLineParser$OptionStringComparator.classPK

+A\`M~U�2��p�org/gradle/cli/CommandLineParser$ParserState.classPK

+Ap�X
+�k?��ıorg/gradle/cli/CommandLineParser$UnknownOptionParserState.classPK

+A�=l)&����org/gradle/cli/CommandLineParser.classPK

+A��>�&��X�org/gradle/cli/ParsedCommandLine.classPK

+Ay�t�E,��e�org/gradle/cli/ParsedCommandLineOption.classPK

+A\\\\v�B|
:����org/gradle/cli/ProjectPropertiesCommandLineConverter.classPK

+A
+�8=|
�9��]�org/gradle/cli/SystemPropertiesCommandLineConverter.classPK44J0�",
+  "gradle/wrapper/gradle-wrapper.properties": "distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\\\\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+",
+  "gradlew": "#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the \\"License\\");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an \\"AS IS\\" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «\${var}», «\${var:-default}», «\${var+SET}»,
+#           «\${var#prefix}», «\${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The \\"traditional\\" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in \\"$@\\", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=\${app_path%\\"\${app_path##*/}\\"}  # leaves a trailing /; empty if no leading path
+    [ -h \\"$app_path\\" ]
+do
+    ls=$( ls -ld \\"$app_path\\" )
+    link=\${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd \\"\${APP_HOME:-./}\\" && pwd -P ) || exit
+
+APP_NAME=\\"Gradle\\"
+APP_BASE_NAME=\${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 \\"-Xmx64m\\" \\"-Xms64m\\"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo \\"$*\\"
+} >&2
+
+die () {
+    echo
+    echo \\"$*\\"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case \\"$( uname )\\" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n \\"$JAVA_HOME\\" ] ; then
+    if [ -x \\"$JAVA_HOME/jre/sh/java\\" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x \\"$JAVACMD\\" ] ; then
+        die \\"ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation.\\"
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die \\"ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation.\\"
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! \\"$cygwin\\" && ! \\"$darwin\\" && ! \\"$nonstop\\" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn \\"Could not query maximum file descriptor limit\\"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n \\"$MAX_FD\\" ||
+            warn \\"Could not set maximum file descriptor limit to $MAX_FD\\"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if \\"$cygwin\\" || \\"$msys\\" ; then
+    APP_HOME=$( cygpath --path --mixed \\"$APP_HOME\\" )
+    CLASSPATH=$( cygpath --path --mixed \\"$CLASSPATH\\" )
+
+    JAVACMD=$( cygpath --unix \\"$JAVACMD\\" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=\${arg#/} t=/\${t%%/*}              # looks like a POSIX filepath
+                    [ -e \\"$t\\" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed \\"$arg\\" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a \`for\` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in \`arg\`.
+        shift                   # remove old arg
+        set -- \\"$@\\" \\"$arg\\"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \\\\
+        \\"-Dorg.gradle.appname=$APP_BASE_NAME\\" \\\\
+        -classpath \\"$CLASSPATH\\" \\\\
+        org.gradle.wrapper.GradleWrapperMain \\\\
+        \\"$@\\"
+
+# Use \\"xargs\\" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<\\"$var\\" ) &&
+#   set -- \\"\${ARGS[@]}\\" \\"$@\\"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single \\"set\\" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval \\"set -- $(
+        printf '%s\\\\n' \\"$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS\\" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\\\\\\\&~g; ' |
+        tr '\\\\n' ' '
+    )\\" '\\"$@\\"'
+
+exec \\"$JAVACMD\\" \\"$@\\"
+",
+  "gradlew.bat": "@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the \\"License\\");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an \\"AS IS\\" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if \\"%DEBUG%\\" == \\"\\" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if \\"%OS%\\"==\\"Windows_NT\\" setlocal
+
+set DIRNAME=%~dp0
+if \\"%DIRNAME%\\" == \\"\\" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any \\".\\" and \\"..\\" in APP_HOME to make it shorter.
+for %%i in (\\"%APP_HOME%\\") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 \\"-Xmx64m\\" \\"-Xms64m\\"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if \\"%ERRORLEVEL%\\" == \\"0\\" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:\\"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist \\"%JAVA_EXE%\\" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\\\\gradle\\\\wrapper\\\\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+\\"%JAVA_EXE%\\" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% \\"-Dorg.gradle.appname=%APP_BASE_NAME%\\" -classpath \\"%CLASSPATH%\\" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if \\"%ERRORLEVEL%\\"==\\"0\\" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not \\"\\" == \\"%GRADLE_EXIT_CONSOLE%\\" exit 1
+exit /b 1
+
+:mainEnd
+if \\"%OS%\\"==\\"Windows_NT\\" endlocal
+
+:omega
+",
+  "pom.xml": "<project xmlns=\\"http://maven.apache.org/POM/4.0.0\\" xmlns:xsi=\\"http://www.w3.org/2001/XMLSchema-instance\\"
+         xsi:schemaLocation=\\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\\">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>test</groupId>
+    <artifactId>com.aws.pdk.test</artifactId>
+    <packaging>jar</packaging>
+    <name>com.aws.pdk.test</name>
+    <version>1.0.0</version>
+    <url>https://github.com/openapitools/openapi-generator</url>
+    <description>OpenAPI Java</description>
+    <scm>
+        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
+        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
+        <url>https://github.com/openapitools/openapi-generator</url>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>Unlicense</name>
+            <url>http://unlicense.org</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>OpenAPI-Generator Contributors</name>
+            <email>team@openapitools.org</email>
+            <organization>OpenAPITools.org</organization>
+            <organizationUrl>http://openapitools.org</organizationUrl>
+        </developer>
+    </developers>
+
+    <build>
+        <plugins>
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <fork>true</fork>
+                    <meminitial>128m</meminitial>
+                    <maxmem>512m</maxmem>
+                    <compilerArgs>
+                        <arg>-Xlint:all</arg>
+                        <arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>loggerPath</name>
+                            <value>conf/log4j.properties</value>
+                        </property>
+                    </systemProperties>
+                    <argLine>-Xms512m -Xmx1500m</argLine>
+                    <parallel>methods</parallel>
+                    <threadCount>10</threadCount>
+                </configuration>
+                <dependencies>
+                    <!--Custom provider and engine for Junit 5 to surefire-->
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>\${junit-version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>\${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- attach test jar -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <id>add_sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add_test_sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.4.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <doclint>none</doclint>
+                    <tags>
+                        <tag>
+                            <name>http.response.details</name>
+                            <placement>a</placement>
+                            <head>Http Response Details:</head>
+                        </tag>
+                    </tags>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Use spotless plugin to automatically format code, remove unused import, etc
+                 To apply changes directly to the file, run \`mvn spotless:apply\`
+                 Ref: https://github.com/diffplug/spotless/tree/main/plugin-maven
+            -->
+            <plugin>
+              <groupId>com.diffplug.spotless</groupId>
+              <artifactId>spotless-maven-plugin</artifactId>
+              <version>\${spotless.version}</version>
+              <configuration>
+                <formats>
+                  <!-- you can define as many formats as you want, each is independent -->
+                  <format>
+                    <!-- define the files to apply to -->
+                    <includes>
+                      <include>.gitignore</include>
+                    </includes>
+                    <!-- define the steps to apply to those files -->
+                    <trimTrailingWhitespace/>
+                    <endWithNewline/>
+                    <indent>
+                      <spaces>true</spaces> <!-- or <tabs>true</tabs> -->
+                      <spacesPerTab>4</spacesPerTab> <!-- optional, default is 4 -->
+                    </indent>
+                  </format>
+                </formats>
+                <!-- define a language-specific format -->
+                <java>
+                  <!-- no need to specify files, inferred automatically, but you can if you want -->
+
+                  <!-- apply a specific flavor of google-java-format and reflow long strings -->
+                  <googleJavaFormat>
+                    <version>1.8</version>
+                    <style>AOSP</style>
+                    <reflowLongStrings>true</reflowLongStrings>
+                  </googleJavaFormat>
+
+                  <removeUnusedImports/>
+                  <importOrder/>
+
+                </java>
+              </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>sign-artifacts</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>\${okhttp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>\${okhttp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>\${gson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.gsonfire</groupId>
+            <artifactId>gson-fire</artifactId>
+            <version>\${gson-fire-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>\${commons-lang3-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>\${jakarta-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>\${jackson-databind-nullable-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <version>\${jsr311-api-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>\${javax.ws.rs-api-version}</version>
+        </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>\${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>\${junit-platform-runner.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>\${mockito-core-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <java.version>1.8</java.version>
+        <maven.compiler.source>\${java.version}</maven.compiler.source>
+        <maven.compiler.target>\${java.version}</maven.compiler.target>
+        <gson-fire-version>1.8.5</gson-fire-version>
+        <swagger-annotations-version>1.6.6</swagger-annotations-version>
+        <okhttp-version>4.10.0</okhttp-version>
+        <gson-version>2.9.1</gson-version>
+        <commons-lang3-version>3.12.0</commons-lang3-version>
+        <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
+        <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <junit-version>5.9.1</junit-version>
+        <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
+        <mockito-core-version>3.12.4</mockito-core-version>
+        <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
+        <jsr311-api-version>1.1.1</jsr311-api-version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spotless.version>2.27.2</spotless.version>
+    </properties>
+</project>
+",
+  "settings.gradle": "rootProject.name = \\"com.aws.pdk.test\\"",
+  "src/main/AndroidManifest.xml": "<manifest package=\\"test.test.client\\" xmlns:android=\\"http://schemas.android.com/apk/res/android\\">
+    <application />
+</manifest>
+",
+  "src/main/java/org/acme/Main.java": "package org.acme;
+
+public class Main {
+  public static void main(final String[] args) {
+    System.out.println(\\"Hello, world!\\");
+  }
+}",
+  "src/main/java/test/test/client/ApiCallback.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+import java.io.IOException;
+
+import java.util.Map;
+import java.util.List;
+
+/**
+ * Callback for asynchronous API call.
+ *
+ * @param <T> The return type
+ */
+public interface ApiCallback<T> {
+    /**
+     * This is called when the API call fails.
+     *
+     * @param e The exception causing the failure
+     * @param statusCode Status code of the response if available, otherwise it would be 0
+     * @param responseHeaders Headers of the response if available, otherwise it would be null
+     */
+    void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders);
+
+    /**
+     * This is called when the API call succeeded.
+     *
+     * @param result The result deserialized from response
+     * @param statusCode Status code of the response
+     * @param responseHeaders Headers of the response
+     */
+    void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders);
+
+    /**
+     * This is called when the API upload processing.
+     *
+     * @param bytesWritten bytes Written
+     * @param contentLength content length of request body
+     * @param done write end
+     */
+    void onUploadProgress(long bytesWritten, long contentLength, boolean done);
+
+    /**
+     * This is called when the API download processing.
+     *
+     * @param bytesRead bytes Read
+     * @param contentLength content length of the response
+     * @param done Read end
+     */
+    void onDownloadProgress(long bytesRead, long contentLength, boolean done);
+}
+",
+  "src/main/java/test/test/client/ApiClient.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+import okhttp3.*;
+import okhttp3.internal.http.HttpMethod;
+import okhttp3.internal.tls.OkHostnameVerifier;
+import okhttp3.logging.HttpLoggingInterceptor;
+import okhttp3.logging.HttpLoggingInterceptor.Level;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.Okio;
+
+import javax.net.ssl.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.text.DateFormat;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import test.test.client.auth.Authentication;
+import test.test.client.auth.HttpBasicAuth;
+import test.test.client.auth.HttpBearerAuth;
+import test.test.client.auth.ApiKeyAuth;
+
+/**
+ * <p>ApiClient class.</p>
+ */
+public class ApiClient {
+
+    private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
+    private boolean debugging = false;
+    private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
+    private Map<String, String> defaultCookieMap = new HashMap<String, String>();
+    private String tempFolderPath = null;
+
+    private Map<String, Authentication> authentications;
+
+    private DateFormat dateFormat;
+    private DateFormat datetimeFormat;
+    private boolean lenientDatetimeFormat;
+    private int dateLength;
+
+    private InputStream sslCaCert;
+    private boolean verifyingSsl;
+    private KeyManager[] keyManagers;
+
+    private OkHttpClient httpClient;
+    private JSON json;
+
+    private HttpLoggingInterceptor loggingInterceptor;
+
+    /**
+     * Basic constructor for ApiClient
+     */
+    public ApiClient() {
+        init();
+        initHttpClient();
+
+        // Setup authentications (key: authentication name, value: authentication).
+        // Prevent the authentications from being modified.
+        authentications = Collections.unmodifiableMap(authentications);
+    }
+
+    /**
+     * Basic constructor with custom OkHttpClient
+     *
+     * @param client a {@link okhttp3.OkHttpClient} object
+     */
+    public ApiClient(OkHttpClient client) {
+        init();
+
+        httpClient = client;
+
+        // Setup authentications (key: authentication name, value: authentication).
+        // Prevent the authentications from being modified.
+        authentications = Collections.unmodifiableMap(authentications);
+    }
+
+    private void initHttpClient() {
+        initHttpClient(Collections.<Interceptor>emptyList());
+    }
+
+    private void initHttpClient(List<Interceptor> interceptors) {
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        builder.addNetworkInterceptor(getProgressInterceptor());
+        for (Interceptor interceptor: interceptors) {
+            builder.addInterceptor(interceptor);
+        }
+
+        httpClient = builder.build();
+    }
+
+    private void init() {
+        verifyingSsl = true;
+
+        json = new JSON();
+
+        // Set default User-Agent.
+        setUserAgent(\\"OpenAPI-Generator/1.0.0/java\\");
+
+        authentications = new HashMap<String, Authentication>();
+    }
+
+    /**
+     * Get base path
+     *
+     * @return Base path
+     */
+    public String getBasePath() {
+        return basePath;
+    }
+
+    /**
+     * Set base path
+     *
+     * @param basePath Base path of the URL (e.g http://localhost
+     * @return An instance of OkHttpClient
+     */
+    public ApiClient setBasePath(String basePath) {
+        this.basePath = basePath;
+        return this;
+    }
+
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
+    /**
+     * Get HTTP client
+     *
+     * @return An instance of OkHttpClient
+     */
+    public OkHttpClient getHttpClient() {
+        return httpClient;
+    }
+
+    /**
+     * Set HTTP client, which must never be null.
+     *
+     * @param newHttpClient An instance of OkHttpClient
+     * @return Api Client
+     * @throws java.lang.NullPointerException when newHttpClient is null
+     */
+    public ApiClient setHttpClient(OkHttpClient newHttpClient) {
+        this.httpClient = Objects.requireNonNull(newHttpClient, \\"HttpClient must not be null!\\");
+        return this;
+    }
+
+    /**
+     * Get JSON
+     *
+     * @return JSON object
+     */
+    public JSON getJSON() {
+        return json;
+    }
+
+    /**
+     * Set JSON
+     *
+     * @param json JSON object
+     * @return Api client
+     */
+    public ApiClient setJSON(JSON json) {
+        this.json = json;
+        return this;
+    }
+
+    /**
+     * True if isVerifyingSsl flag is on
+     *
+     * @return True if isVerifySsl flag is on
+     */
+    public boolean isVerifyingSsl() {
+        return verifyingSsl;
+    }
+
+    /**
+     * Configure whether to verify certificate and hostname when making https requests.
+     * Default to true.
+     * NOTE: Do NOT set to false in production code, otherwise you would face multiple types of cryptographic attacks.
+     *
+     * @param verifyingSsl True to verify TLS/SSL connection
+     * @return ApiClient
+     */
+    public ApiClient setVerifyingSsl(boolean verifyingSsl) {
+        this.verifyingSsl = verifyingSsl;
+        applySslSettings();
+        return this;
+    }
+
+    /**
+     * Get SSL CA cert.
+     *
+     * @return Input stream to the SSL CA cert
+     */
+    public InputStream getSslCaCert() {
+        return sslCaCert;
+    }
+
+    /**
+     * Configure the CA certificate to be trusted when making https requests.
+     * Use null to reset to default.
+     *
+     * @param sslCaCert input stream for SSL CA cert
+     * @return ApiClient
+     */
+    public ApiClient setSslCaCert(InputStream sslCaCert) {
+        this.sslCaCert = sslCaCert;
+        applySslSettings();
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>keyManagers</code>.</p>
+     *
+     * @return an array of {@link javax.net.ssl.KeyManager} objects
+     */
+    public KeyManager[] getKeyManagers() {
+        return keyManagers;
+    }
+
+    /**
+     * Configure client keys to use for authorization in an SSL session.
+     * Use null to reset to default.
+     *
+     * @param managers The KeyManagers to use
+     * @return ApiClient
+     */
+    public ApiClient setKeyManagers(KeyManager[] managers) {
+        this.keyManagers = managers;
+        applySslSettings();
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>dateFormat</code>.</p>
+     *
+     * @return a {@link java.text.DateFormat} object
+     */
+    public DateFormat getDateFormat() {
+        return dateFormat;
+    }
+
+    /**
+     * <p>Setter for the field <code>dateFormat</code>.</p>
+     *
+     * @param dateFormat a {@link java.text.DateFormat} object
+     * @return a {@link test.test.client.ApiClient} object
+     */
+    public ApiClient setDateFormat(DateFormat dateFormat) {
+        JSON.setDateFormat(dateFormat);
+        return this;
+    }
+
+    /**
+     * <p>Set SqlDateFormat.</p>
+     *
+     * @param dateFormat a {@link java.text.DateFormat} object
+     * @return a {@link test.test.client.ApiClient} object
+     */
+    public ApiClient setSqlDateFormat(DateFormat dateFormat) {
+        JSON.setSqlDateFormat(dateFormat);
+        return this;
+    }
+
+    /**
+     * <p>Set OffsetDateTimeFormat.</p>
+     *
+     * @param dateFormat a {@link java.time.format.DateTimeFormatter} object
+     * @return a {@link test.test.client.ApiClient} object
+     */
+    public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
+        JSON.setOffsetDateTimeFormat(dateFormat);
+        return this;
+    }
+
+    /**
+     * <p>Set LocalDateFormat.</p>
+     *
+     * @param dateFormat a {@link java.time.format.DateTimeFormatter} object
+     * @return a {@link test.test.client.ApiClient} object
+     */
+    public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
+        JSON.setLocalDateFormat(dateFormat);
+        return this;
+    }
+
+    /**
+     * <p>Set LenientOnJson.</p>
+     *
+     * @param lenientOnJson a boolean
+     * @return a {@link test.test.client.ApiClient} object
+     */
+    public ApiClient setLenientOnJson(boolean lenientOnJson) {
+        JSON.setLenientOnJson(lenientOnJson);
+        return this;
+    }
+
+    /**
+     * Get authentications (key: authentication name, value: authentication).
+     *
+     * @return Map of authentication objects
+     */
+    public Map<String, Authentication> getAuthentications() {
+        return authentications;
+    }
+
+    /**
+     * Get authentication for the given name.
+     *
+     * @param authName The authentication name
+     * @return The authentication, null if not found
+     */
+    public Authentication getAuthentication(String authName) {
+        return authentications.get(authName);
+    }
+
+
+    /**
+     * Helper method to set username for the first HTTP basic authentication.
+     *
+     * @param username Username
+     */
+    public void setUsername(String username) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof HttpBasicAuth) {
+                ((HttpBasicAuth) auth).setUsername(username);
+                return;
+            }
+        }
+        throw new RuntimeException(\\"No HTTP basic authentication configured!\\");
+    }
+
+    /**
+     * Helper method to set password for the first HTTP basic authentication.
+     *
+     * @param password Password
+     */
+    public void setPassword(String password) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof HttpBasicAuth) {
+                ((HttpBasicAuth) auth).setPassword(password);
+                return;
+            }
+        }
+        throw new RuntimeException(\\"No HTTP basic authentication configured!\\");
+    }
+
+    /**
+     * Helper method to set API key value for the first API key authentication.
+     *
+     * @param apiKey API key
+     */
+    public void setApiKey(String apiKey) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof ApiKeyAuth) {
+                ((ApiKeyAuth) auth).setApiKey(apiKey);
+                return;
+            }
+        }
+        throw new RuntimeException(\\"No API key authentication configured!\\");
+    }
+
+    /**
+     * Helper method to set API key prefix for the first API key authentication.
+     *
+     * @param apiKeyPrefix API key prefix
+     */
+    public void setApiKeyPrefix(String apiKeyPrefix) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof ApiKeyAuth) {
+                ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
+                return;
+            }
+        }
+        throw new RuntimeException(\\"No API key authentication configured!\\");
+    }
+
+    /**
+     * Helper method to set access token for the first OAuth2 authentication.
+     *
+     * @param accessToken Access token
+     */
+    public void setAccessToken(String accessToken) {
+        throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
+    }
+
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
+    /**
+     * Set the User-Agent header's value (by adding to the default header map).
+     *
+     * @param userAgent HTTP request's user agent
+     * @return ApiClient
+     */
+    public ApiClient setUserAgent(String userAgent) {
+        addDefaultHeader(\\"User-Agent\\", userAgent);
+        return this;
+    }
+
+    /**
+     * Add a default header.
+     *
+     * @param key The header's key
+     * @param value The header's value
+     * @return ApiClient
+     */
+    public ApiClient addDefaultHeader(String key, String value) {
+        defaultHeaderMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * Add a default cookie.
+     *
+     * @param key The cookie's key
+     * @param value The cookie's value
+     * @return ApiClient
+     */
+    public ApiClient addDefaultCookie(String key, String value) {
+        defaultCookieMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * Check that whether debugging is enabled for this API client.
+     *
+     * @return True if debugging is enabled, false otherwise.
+     */
+    public boolean isDebugging() {
+        return debugging;
+    }
+
+    /**
+     * Enable/disable debugging for this API client.
+     *
+     * @param debugging To enable (true) or disable (false) debugging
+     * @return ApiClient
+     */
+    public ApiClient setDebugging(boolean debugging) {
+        if (debugging != this.debugging) {
+            if (debugging) {
+                loggingInterceptor = new HttpLoggingInterceptor();
+                loggingInterceptor.setLevel(Level.BODY);
+                httpClient = httpClient.newBuilder().addInterceptor(loggingInterceptor).build();
+            } else {
+                final OkHttpClient.Builder builder = httpClient.newBuilder();
+                builder.interceptors().remove(loggingInterceptor);
+                httpClient = builder.build();
+                loggingInterceptor = null;
+            }
+        }
+        this.debugging = debugging;
+        return this;
+    }
+
+    /**
+     * The path of temporary folder used to store downloaded files from endpoints
+     * with file response. The default value is <code>null</code>, i.e. using
+     * the system's default temporary folder.
+     *
+     * @see <a href=\\"https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#createTempFile(java.lang.String,%20java.lang.String,%20java.nio.file.attribute.FileAttribute...)\\">createTempFile</a>
+     * @return Temporary folder path
+     */
+    public String getTempFolderPath() {
+        return tempFolderPath;
+    }
+
+    /**
+     * Set the temporary folder path (for downloading files)
+     *
+     * @param tempFolderPath Temporary folder path
+     * @return ApiClient
+     */
+    public ApiClient setTempFolderPath(String tempFolderPath) {
+        this.tempFolderPath = tempFolderPath;
+        return this;
+    }
+
+    /**
+     * Get connection timeout (in milliseconds).
+     *
+     * @return Timeout in milliseconds
+     */
+    public int getConnectTimeout() {
+        return httpClient.connectTimeoutMillis();
+    }
+
+    /**
+     * Sets the connect timeout (in milliseconds).
+     * A value of 0 means no timeout, otherwise values must be between 1 and
+     * {@link java.lang.Integer#MAX_VALUE}.
+     *
+     * @param connectionTimeout connection timeout in milliseconds
+     * @return Api client
+     */
+    public ApiClient setConnectTimeout(int connectionTimeout) {
+        httpClient = httpClient.newBuilder().connectTimeout(connectionTimeout, TimeUnit.MILLISECONDS).build();
+        return this;
+    }
+
+    /**
+     * Get read timeout (in milliseconds).
+     *
+     * @return Timeout in milliseconds
+     */
+    public int getReadTimeout() {
+        return httpClient.readTimeoutMillis();
+    }
+
+    /**
+     * Sets the read timeout (in milliseconds).
+     * A value of 0 means no timeout, otherwise values must be between 1 and
+     * {@link java.lang.Integer#MAX_VALUE}.
+     *
+     * @param readTimeout read timeout in milliseconds
+     * @return Api client
+     */
+    public ApiClient setReadTimeout(int readTimeout) {
+        httpClient = httpClient.newBuilder().readTimeout(readTimeout, TimeUnit.MILLISECONDS).build();
+        return this;
+    }
+
+    /**
+     * Get write timeout (in milliseconds).
+     *
+     * @return Timeout in milliseconds
+     */
+    public int getWriteTimeout() {
+        return httpClient.writeTimeoutMillis();
+    }
+
+    /**
+     * Sets the write timeout (in milliseconds).
+     * A value of 0 means no timeout, otherwise values must be between 1 and
+     * {@link java.lang.Integer#MAX_VALUE}.
+     *
+     * @param writeTimeout connection timeout in milliseconds
+     * @return Api client
+     */
+    public ApiClient setWriteTimeout(int writeTimeout) {
+        httpClient = httpClient.newBuilder().writeTimeout(writeTimeout, TimeUnit.MILLISECONDS).build();
+        return this;
+    }
+
+
+    /**
+     * Format the given parameter object into string.
+     *
+     * @param param Parameter
+     * @return String representation of the parameter
+     */
+    public String parameterToString(Object param) {
+        if (param == null) {
+            return \\"\\";
+        } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
+            //Serialize to json string and remove the \\" enclosing characters
+            String jsonStr = JSON.serialize(param);
+            return jsonStr.substring(1, jsonStr.length() - 1);
+        } else if (param instanceof Collection) {
+            StringBuilder b = new StringBuilder();
+            for (Object o : (Collection) param) {
+                if (b.length() > 0) {
+                    b.append(\\",\\");
+                }
+                b.append(o);
+            }
+            return b.toString();
+        } else {
+            return String.valueOf(param);
+        }
+    }
+
+    /**
+     * Formats the specified query parameter to a list containing a single {@code Pair} object.
+     *
+     * Note that {@code value} must not be a collection.
+     *
+     * @param name The name of the parameter.
+     * @param value The value of the parameter.
+     * @return A list containing a single {@code Pair} object.
+     */
+    public List<Pair> parameterToPair(String name, Object value) {
+        List<Pair> params = new ArrayList<Pair>();
+
+        // preconditions
+        if (name == null || name.isEmpty() || value == null || value instanceof Collection) {
+            return params;
+        }
+
+        params.add(new Pair(name, parameterToString(value)));
+        return params;
+    }
+
+    /**
+     * Formats the specified collection query parameters to a list of {@code Pair} objects.
+     *
+     * Note that the values of each of the returned Pair objects are percent-encoded.
+     *
+     * @param collectionFormat The collection format of the parameter.
+     * @param name The name of the parameter.
+     * @param value The value of the parameter.
+     * @return A list of {@code Pair} objects.
+     */
+    public List<Pair> parameterToPairs(String collectionFormat, String name, Collection value) {
+        List<Pair> params = new ArrayList<Pair>();
+
+        // preconditions
+        if (name == null || name.isEmpty() || value == null || value.isEmpty()) {
+            return params;
+        }
+
+        // create the params based on the collection format
+        if (\\"multi\\".equals(collectionFormat)) {
+            for (Object item : value) {
+                params.add(new Pair(name, escapeString(parameterToString(item))));
+            }
+            return params;
+        }
+
+        // collectionFormat is assumed to be \\"csv\\" by default
+        String delimiter = \\",\\";
+
+        // escape all delimiters except commas, which are URI reserved
+        // characters
+        if (\\"ssv\\".equals(collectionFormat)) {
+            delimiter = escapeString(\\" \\");
+        } else if (\\"tsv\\".equals(collectionFormat)) {
+            delimiter = escapeString(\\"\\\\t\\");
+        } else if (\\"pipes\\".equals(collectionFormat)) {
+            delimiter = escapeString(\\"|\\");
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (Object item : value) {
+            sb.append(delimiter);
+            sb.append(escapeString(parameterToString(item)));
+        }
+
+        params.add(new Pair(name, sb.substring(delimiter.length())));
+
+        return params;
+    }
+
+    /**
+     * Formats the specified collection path parameter to a string value.
+     *
+     * @param collectionFormat The collection format of the parameter.
+     * @param value The value of the parameter.
+     * @return String representation of the parameter
+     */
+    public String collectionPathParameterToString(String collectionFormat, Collection value) {
+        // create the value based on the collection format
+        if (\\"multi\\".equals(collectionFormat)) {
+            // not valid for path params
+            return parameterToString(value);
+        }
+
+        // collectionFormat is assumed to be \\"csv\\" by default
+        String delimiter = \\",\\";
+
+        if (\\"ssv\\".equals(collectionFormat)) {
+            delimiter = \\" \\";
+        } else if (\\"tsv\\".equals(collectionFormat)) {
+            delimiter = \\"\\\\t\\";
+        } else if (\\"pipes\\".equals(collectionFormat)) {
+            delimiter = \\"|\\";
+        }
+
+        StringBuilder sb = new StringBuilder() ;
+        for (Object item : value) {
+            sb.append(delimiter);
+            sb.append(parameterToString(item));
+        }
+
+        return sb.substring(delimiter.length());
+    }
+
+    /**
+     * Sanitize filename by removing path.
+     * e.g. ../../sun.gif becomes sun.gif
+     *
+     * @param filename The filename to be sanitized
+     * @return The sanitized filename
+     */
+    public String sanitizeFilename(String filename) {
+        return filename.replaceAll(\\".*[/\\\\\\\\\\\\\\\\]\\", \\"\\");
+    }
+
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *   application/vnd.company+json
+     * \\"* / *\\" is also default to JSON
+     * @param mime MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    public boolean isJsonMime(String mime) {
+        String jsonMime = \\"(?i)^(application/json|[^;/ \\\\t]+/[^;/ \\\\t]+[+]json)[ \\\\t]*(;.*)?$\\";
+        return mime != null && (mime.matches(jsonMime) || mime.equals(\\"*/*\\"));
+    }
+
+    /**
+     * Select the Accept header's value from the given accepts array:
+     *   if JSON exists in the given array, use it;
+     *   otherwise use all of them (joining into a string)
+     *
+     * @param accepts The accepts array to select from
+     * @return The Accept header to use. If the given array is empty,
+     *   null will be returned (not to set the Accept header explicitly).
+     */
+    public String selectHeaderAccept(String[] accepts) {
+        if (accepts.length == 0) {
+            return null;
+        }
+        for (String accept : accepts) {
+            if (isJsonMime(accept)) {
+                return accept;
+            }
+        }
+        return StringUtil.join(accepts, \\",\\");
+    }
+
+    /**
+     * Select the Content-Type header's value from the given array:
+     *   if JSON exists in the given array, use it;
+     *   otherwise use the first one of the array.
+     *
+     * @param contentTypes The Content-Type array to select from
+     * @return The Content-Type header to use. If the given array is empty,
+     *   returns null. If it matches \\"any\\", JSON will be used.
+     */
+    public String selectHeaderContentType(String[] contentTypes) {
+        if (contentTypes.length == 0) {
+            return null;
+        }
+
+        if (contentTypes[0].equals(\\"*/*\\")) {
+            return \\"application/json\\";
+        }
+
+        for (String contentType : contentTypes) {
+            if (isJsonMime(contentType)) {
+                return contentType;
+            }
+        }
+
+        return contentTypes[0];
+    }
+
+    /**
+     * Escape the given string to be used as URL query value.
+     *
+     * @param str String to be escaped
+     * @return Escaped string
+     */
+    public String escapeString(String str) {
+        try {
+            return URLEncoder.encode(str, \\"utf8\\").replaceAll(\\"\\\\\\\\+\\", \\"%20\\");
+        } catch (UnsupportedEncodingException e) {
+            return str;
+        }
+    }
+
+    /**
+     * Deserialize response body to Java object, according to the return type and
+     * the Content-Type response header.
+     *
+     * @param <T> Type
+     * @param response HTTP response
+     * @param returnType The type of the Java object
+     * @return The deserialized Java object
+     * @throws test.test.client.ApiException If fail to deserialize response body, i.e. cannot read response body
+     *   or the Content-Type of the response is not supported.
+     */
+    @SuppressWarnings(\\"unchecked\\")
+    public <T> T deserialize(Response response, Type returnType) throws ApiException {
+        if (response == null || returnType == null) {
+            return null;
+        }
+
+        if (\\"byte[]\\".equals(returnType.toString())) {
+            // Handle binary response (byte array).
+            try {
+                return (T) response.body().bytes();
+            } catch (IOException e) {
+                throw new ApiException(e);
+            }
+        } else if (returnType.equals(File.class)) {
+            // Handle file downloading.
+            return (T) downloadFileFromResponse(response);
+        }
+
+        String respBody;
+        try {
+            if (response.body() != null)
+                respBody = response.body().string();
+            else
+                respBody = null;
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+
+        if (respBody == null || \\"\\".equals(respBody)) {
+            return null;
+        }
+
+        String contentType = response.headers().get(\\"Content-Type\\");
+        if (contentType == null) {
+            // ensuring a default content type
+            contentType = \\"application/json\\";
+        }
+        if (isJsonMime(contentType)) {
+            return JSON.deserialize(respBody, returnType);
+        } else if (returnType.equals(String.class)) {
+            // Expecting string, return the raw response body.
+            return (T) respBody;
+        } else {
+            throw new ApiException(
+                    \\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported for type: \\" + returnType,
+                    response.code(),
+                    response.headers().toMultimap(),
+                    respBody);
+        }
+    }
+
+    /**
+     * Serialize the given Java object into request body according to the object's
+     * class and the request Content-Type.
+     *
+     * @param obj The Java object
+     * @param contentType The request Content-Type
+     * @return The serialized request body
+     * @throws test.test.client.ApiException If fail to serialize the given object
+     */
+    public RequestBody serialize(Object obj, String contentType) throws ApiException {
+        if (obj instanceof byte[]) {
+            // Binary (byte array) body parameter support.
+            return RequestBody.create((byte[]) obj, MediaType.parse(contentType));
+        } else if (obj instanceof File) {
+            // File body parameter support.
+            return RequestBody.create((File) obj, MediaType.parse(contentType));
+        } else if (\\"text/plain\\".equals(contentType) && obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
+        } else if (isJsonMime(contentType)) {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
+        } else {
+            throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
+        }
+    }
+
+    /**
+     * Download file from the given response.
+     *
+     * @param response An instance of the Response object
+     * @throws test.test.client.ApiException If fail to read file content from response and write to disk
+     * @return Downloaded file
+     */
+    public File downloadFileFromResponse(Response response) throws ApiException {
+        try {
+            File file = prepareDownloadFile(response);
+            BufferedSink sink = Okio.buffer(Okio.sink(file));
+            sink.writeAll(response.body().source());
+            sink.close();
+            return file;
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+    }
+
+    /**
+     * Prepare file for download
+     *
+     * @param response An instance of the Response object
+     * @return Prepared file for the download
+     * @throws java.io.IOException If fail to prepare file for download
+     */
+    public File prepareDownloadFile(Response response) throws IOException {
+        String filename = null;
+        String contentDisposition = response.header(\\"Content-Disposition\\");
+        if (contentDisposition != null && !\\"\\".equals(contentDisposition)) {
+            // Get filename from the Content-Disposition header.
+            Pattern pattern = Pattern.compile(\\"filename=['\\\\\\"]?([^'\\\\\\"\\\\\\\\s]+)['\\\\\\"]?\\");
+            Matcher matcher = pattern.matcher(contentDisposition);
+            if (matcher.find()) {
+                filename = sanitizeFilename(matcher.group(1));
+            }
+        }
+
+        String prefix = null;
+        String suffix = null;
+        if (filename == null) {
+            prefix = \\"download-\\";
+            suffix = \\"\\";
+        } else {
+            int pos = filename.lastIndexOf(\\".\\");
+            if (pos == -1) {
+                prefix = filename + \\"-\\";
+            } else {
+                prefix = filename.substring(0, pos) + \\"-\\";
+                suffix = filename.substring(pos);
+            }
+            // Files.createTempFile requires the prefix to be at least three characters long
+            if (prefix.length() < 3)
+                prefix = \\"download-\\";
+        }
+
+        if (tempFolderPath == null)
+            return Files.createTempFile(prefix, suffix).toFile();
+        else
+            return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
+    }
+
+    /**
+     * {@link #execute(Call, Type)}
+     *
+     * @param <T> Type
+     * @param call An instance of the Call object
+     * @return ApiResponse&lt;T&gt;
+     * @throws test.test.client.ApiException If fail to execute the call
+     */
+    public <T> ApiResponse<T> execute(Call call) throws ApiException {
+        return execute(call, null);
+    }
+
+    /**
+     * Execute HTTP call and deserialize the HTTP response body into the given return type.
+     *
+     * @param returnType The return type used to deserialize HTTP response body
+     * @param <T> The return type corresponding to (same with) returnType
+     * @param call Call
+     * @return ApiResponse object containing response status, headers and
+     *   data, which is a Java object deserialized from response body and would be null
+     *   when returnType is null.
+     * @throws test.test.client.ApiException If fail to execute the call
+     */
+    public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiException {
+        try {
+            Response response = call.execute();
+            T data = handleResponse(response, returnType);
+            return new ApiResponse<T>(response.code(), response.headers().toMultimap(), data);
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+    }
+
+    /**
+     * {@link #executeAsync(Call, Type, ApiCallback)}
+     *
+     * @param <T> Type
+     * @param call An instance of the Call object
+     * @param callback ApiCallback&lt;T&gt;
+     */
+    public <T> void executeAsync(Call call, ApiCallback<T> callback) {
+        executeAsync(call, null, callback);
+    }
+
+    /**
+     * Execute HTTP call asynchronously.
+     *
+     * @param <T> Type
+     * @param call The callback to be executed when the API call finishes
+     * @param returnType Return type
+     * @param callback ApiCallback
+     * @see #execute(Call, Type)
+     */
+    @SuppressWarnings(\\"unchecked\\")
+    public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
+        call.enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                callback.onFailure(new ApiException(e), 0, null);
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                T result;
+                try {
+                    result = (T) handleResponse(response, returnType);
+                } catch (ApiException e) {
+                    callback.onFailure(e, response.code(), response.headers().toMultimap());
+                    return;
+                } catch (Exception e) {
+                    callback.onFailure(new ApiException(e), response.code(), response.headers().toMultimap());
+                    return;
+                }
+                callback.onSuccess(result, response.code(), response.headers().toMultimap());
+            }
+        });
+    }
+
+    /**
+     * Handle the given response, return the deserialized object when the response is successful.
+     *
+     * @param <T> Type
+     * @param response Response
+     * @param returnType Return type
+     * @return Type
+     * @throws test.test.client.ApiException If the response has an unsuccessful status code or
+     *                      fail to deserialize the response body
+     */
+    public <T> T handleResponse(Response response, Type returnType) throws ApiException {
+        if (response.isSuccessful()) {
+            if (returnType == null || response.code() == 204) {
+                // returning null if the returnType is not defined,
+                // or the status code is 204 (No Content)
+                if (response.body() != null) {
+                    try {
+                        response.body().close();
+                    } catch (Exception e) {
+                        throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+                    }
+                }
+                return null;
+            } else {
+                return deserialize(response, returnType);
+            }
+        } else {
+            String respBody = null;
+            if (response.body() != null) {
+                try {
+                    respBody = response.body().string();
+                } catch (IOException e) {
+                    throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+                }
+            }
+            throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
+        }
+    }
+
+    /**
+     * Build HTTP call with the given options.
+     *
+     * @param baseUrl The base URL
+     * @param path The sub-path of the HTTP URL
+     * @param method The request method, one of \\"GET\\", \\"HEAD\\", \\"OPTIONS\\", \\"POST\\", \\"PUT\\", \\"PATCH\\" and \\"DELETE\\"
+     * @param queryParams The query parameters
+     * @param collectionQueryParams The collection query parameters
+     * @param body The request body object
+     * @param headerParams The header parameters
+     * @param cookieParams The cookie parameters
+     * @param formParams The form parameters
+     * @param authNames The authentications to apply
+     * @param callback Callback for upload/download progress
+     * @return The HTTP call
+     * @throws test.test.client.ApiException If fail to serialize the request body object
+     */
+    public Call buildCall(String baseUrl, String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String[] authNames, ApiCallback callback) throws ApiException {
+        Request request = buildRequest(baseUrl, path, method, queryParams, collectionQueryParams, body, headerParams, cookieParams, formParams, authNames, callback);
+
+        return httpClient.newCall(request);
+    }
+
+    /**
+     * Build an HTTP request with the given options.
+     *
+     * @param baseUrl The base URL
+     * @param path The sub-path of the HTTP URL
+     * @param method The request method, one of \\"GET\\", \\"HEAD\\", \\"OPTIONS\\", \\"POST\\", \\"PUT\\", \\"PATCH\\" and \\"DELETE\\"
+     * @param queryParams The query parameters
+     * @param collectionQueryParams The collection query parameters
+     * @param body The request body object
+     * @param headerParams The header parameters
+     * @param cookieParams The cookie parameters
+     * @param formParams The form parameters
+     * @param authNames The authentications to apply
+     * @param callback Callback for upload/download progress
+     * @return The HTTP request
+     * @throws test.test.client.ApiException If fail to serialize the request body object
+     */
+    public Request buildRequest(String baseUrl, String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String[] authNames, ApiCallback callback) throws ApiException {
+        // aggregate queryParams (non-collection) and collectionQueryParams into allQueryParams
+        List<Pair> allQueryParams = new ArrayList<Pair>(queryParams);
+        allQueryParams.addAll(collectionQueryParams);
+
+        final String url = buildUrl(baseUrl, path, queryParams, collectionQueryParams);
+
+        // prepare HTTP request body
+        RequestBody reqBody;
+        String contentType = headerParams.get(\\"Content-Type\\");
+
+        if (!HttpMethod.permitsRequestBody(method)) {
+            reqBody = null;
+        } else if (\\"application/x-www-form-urlencoded\\".equals(contentType)) {
+            reqBody = buildRequestBodyFormEncoding(formParams);
+        } else if (\\"multipart/form-data\\".equals(contentType)) {
+            reqBody = buildRequestBodyMultipart(formParams);
+        } else if (body == null) {
+            if (\\"DELETE\\".equals(method)) {
+                // allow calling DELETE without sending a request body
+                reqBody = null;
+            } else {
+                // use an empty request body (for POST, PUT and PATCH)
+                reqBody = RequestBody.create(\\"\\", contentType == null ? null : MediaType.parse(contentType));
+            }
+        } else {
+            reqBody = serialize(body, contentType);
+        }
+
+        // update parameters with authentication settings
+        updateParamsForAuth(authNames, allQueryParams, headerParams, cookieParams, requestBodyToString(reqBody), method, URI.create(url));
+
+        final Request.Builder reqBuilder = new Request.Builder().url(url);
+        processHeaderParams(headerParams, reqBuilder);
+        processCookieParams(cookieParams, reqBuilder);
+
+        // Associate callback with request (if not null) so interceptor can
+        // access it when creating ProgressResponseBody
+        reqBuilder.tag(callback);
+
+        Request request = null;
+
+        if (callback != null && reqBody != null) {
+            ProgressRequestBody progressRequestBody = new ProgressRequestBody(reqBody, callback);
+            request = reqBuilder.method(method, progressRequestBody).build();
+        } else {
+            request = reqBuilder.method(method, reqBody).build();
+        }
+
+        return request;
+    }
+
+    /**
+     * Build full URL by concatenating base path, the given sub path and query parameters.
+     *
+     * @param baseUrl The base URL
+     * @param path The sub path
+     * @param queryParams The query parameters
+     * @param collectionQueryParams The collection query parameters
+     * @return The full URL
+     */
+    public String buildUrl(String baseUrl, String path, List<Pair> queryParams, List<Pair> collectionQueryParams) {
+        final StringBuilder url = new StringBuilder();
+        if (baseUrl != null) {
+            url.append(baseUrl).append(path);
+        } else {
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
+        }
+
+        if (queryParams != null && !queryParams.isEmpty()) {
+            // support (constant) query string in \`path\`, e.g. \\"/posts?draft=1\\"
+            String prefix = path.contains(\\"?\\") ? \\"&\\" : \\"?\\";
+            for (Pair param : queryParams) {
+                if (param.getValue() != null) {
+                    if (prefix != null) {
+                        url.append(prefix);
+                        prefix = null;
+                    } else {
+                        url.append(\\"&\\");
+                    }
+                    String value = parameterToString(param.getValue());
+                    url.append(escapeString(param.getName())).append(\\"=\\").append(escapeString(value));
+                }
+            }
+        }
+
+        if (collectionQueryParams != null && !collectionQueryParams.isEmpty()) {
+            String prefix = url.toString().contains(\\"?\\") ? \\"&\\" : \\"?\\";
+            for (Pair param : collectionQueryParams) {
+                if (param.getValue() != null) {
+                    if (prefix != null) {
+                        url.append(prefix);
+                        prefix = null;
+                    } else {
+                        url.append(\\"&\\");
+                    }
+                    String value = parameterToString(param.getValue());
+                    // collection query parameter value already escaped as part of parameterToPairs
+                    url.append(escapeString(param.getName())).append(\\"=\\").append(value);
+                }
+            }
+        }
+
+        return url.toString();
+    }
+
+    /**
+     * Set header parameters to the request builder, including default headers.
+     *
+     * @param headerParams Header parameters in the form of Map
+     * @param reqBuilder Request.Builder
+     */
+    public void processHeaderParams(Map<String, String> headerParams, Request.Builder reqBuilder) {
+        for (Entry<String, String> param : headerParams.entrySet()) {
+            reqBuilder.header(param.getKey(), parameterToString(param.getValue()));
+        }
+        for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
+            if (!headerParams.containsKey(header.getKey())) {
+                reqBuilder.header(header.getKey(), parameterToString(header.getValue()));
+            }
+        }
+    }
+
+    /**
+     * Set cookie parameters to the request builder, including default cookies.
+     *
+     * @param cookieParams Cookie parameters in the form of Map
+     * @param reqBuilder Request.Builder
+     */
+    public void processCookieParams(Map<String, String> cookieParams, Request.Builder reqBuilder) {
+        for (Entry<String, String> param : cookieParams.entrySet()) {
+            reqBuilder.addHeader(\\"Cookie\\", String.format(\\"%s=%s\\", param.getKey(), param.getValue()));
+        }
+        for (Entry<String, String> param : defaultCookieMap.entrySet()) {
+            if (!cookieParams.containsKey(param.getKey())) {
+                reqBuilder.addHeader(\\"Cookie\\", String.format(\\"%s=%s\\", param.getKey(), param.getValue()));
+            }
+        }
+    }
+
+    /**
+     * Update query and header parameters based on authentication settings.
+     *
+     * @param authNames The authentications to apply
+     * @param queryParams List of query parameters
+     * @param headerParams Map of header parameters
+     * @param cookieParams Map of cookie parameters
+     * @param payload HTTP request body
+     * @param method HTTP method
+     * @param uri URI
+     * @throws test.test.client.ApiException If fails to update the parameters
+     */
+    public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams,
+                                    Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException {
+        for (String authName : authNames) {
+            Authentication auth = authentications.get(authName);
+            if (auth == null) {
+                throw new RuntimeException(\\"Authentication undefined: \\" + authName);
+            }
+            auth.applyToParams(queryParams, headerParams, cookieParams, payload, method, uri);
+        }
+    }
+
+    /**
+     * Build a form-encoding request body with the given form parameters.
+     *
+     * @param formParams Form parameters in the form of Map
+     * @return RequestBody
+     */
+    public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
+        okhttp3.FormBody.Builder formBuilder = new okhttp3.FormBody.Builder();
+        for (Entry<String, Object> param : formParams.entrySet()) {
+            formBuilder.add(param.getKey(), parameterToString(param.getValue()));
+        }
+        return formBuilder.build();
+    }
+
+    /**
+     * Build a multipart (file uploading) request body with the given form parameters,
+     * which could contain text fields and file fields.
+     *
+     * @param formParams Form parameters in the form of Map
+     * @return RequestBody
+     */
+    public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
+        MultipartBody.Builder mpBuilder = new MultipartBody.Builder().setType(MultipartBody.FORM);
+        for (Entry<String, Object> param : formParams.entrySet()) {
+            if (param.getValue() instanceof File) {
+                File file = (File) param.getValue();
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), file);
+            } else if (param.getValue() instanceof List) {
+                List list = (List) param.getValue();
+                for (Object item: list) {
+                    if (item instanceof File) {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
+                    }
+                }
+            } else {
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
+            }
+        }
+        return mpBuilder.build();
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to \\"application/octet-stream\\").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    public String guessContentTypeFromFile(File file) {
+        String contentType = URLConnection.guessContentTypeFromName(file.getName());
+        if (contentType == null) {
+            return \\"application/octet-stream\\";
+        } else {
+            return contentType;
+        }
+    }
+
+    /**
+     * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder 
+     * @param key The key of the Header element
+     * @param file The file to add to the Header
+     */ 
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"; filename=\\\\\\"\\" + file.getName() + \\"\\\\\\"\\");
+        MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
+        mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
+    }
+
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
+    /**
+     * Get network interceptor to add it to the httpClient to track download progress for
+     * async requests.
+     */
+    private Interceptor getProgressInterceptor() {
+        return new Interceptor() {
+            @Override
+            public Response intercept(Interceptor.Chain chain) throws IOException {
+                final Request request = chain.request();
+                final Response originalResponse = chain.proceed(request);
+                if (request.tag() instanceof ApiCallback) {
+                    final ApiCallback callback = (ApiCallback) request.tag();
+                    return originalResponse.newBuilder()
+                        .body(new ProgressResponseBody(originalResponse.body(), callback))
+                        .build();
+                }
+                return originalResponse;
+            }
+        };
+    }
+
+    /**
+     * Apply SSL related settings to httpClient according to the current values of
+     * verifyingSsl and sslCaCert.
+     */
+    private void applySslSettings() {
+        try {
+            TrustManager[] trustManagers;
+            HostnameVerifier hostnameVerifier;
+            if (!verifyingSsl) {
+                trustManagers = new TrustManager[]{
+                        new X509TrustManager() {
+                            @Override
+                            public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                            }
+
+                            @Override
+                            public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                            }
+
+                            @Override
+                            public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+                                return new java.security.cert.X509Certificate[]{};
+                            }
+                        }
+                };
+                hostnameVerifier = new HostnameVerifier() {
+                    @Override
+                    public boolean verify(String hostname, SSLSession session) {
+                        return true;
+                    }
+                };
+            } else {
+                TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+
+                if (sslCaCert == null) {
+                    trustManagerFactory.init((KeyStore) null);
+                } else {
+                    char[] password = null; // Any password will work.
+                    CertificateFactory certificateFactory = CertificateFactory.getInstance(\\"X.509\\");
+                    Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(sslCaCert);
+                    if (certificates.isEmpty()) {
+                        throw new IllegalArgumentException(\\"expected non-empty set of trusted certificates\\");
+                    }
+                    KeyStore caKeyStore = newEmptyKeyStore(password);
+                    int index = 0;
+                    for (Certificate certificate : certificates) {
+                        String certificateAlias = \\"ca\\" + (index++);
+                        caKeyStore.setCertificateEntry(certificateAlias, certificate);
+                    }
+                    trustManagerFactory.init(caKeyStore);
+                }
+                trustManagers = trustManagerFactory.getTrustManagers();
+                hostnameVerifier = OkHostnameVerifier.INSTANCE;
+            }
+
+            SSLContext sslContext = SSLContext.getInstance(\\"TLS\\");
+            sslContext.init(keyManagers, trustManagers, new SecureRandom());
+            httpClient = httpClient.newBuilder()
+                            .sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustManagers[0])
+                            .hostnameVerifier(hostnameVerifier)
+                            .build();
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityException {
+        try {
+            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            keyStore.load(null, password);
+            return keyStore;
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Convert the HTTP request body to a string.
+     *
+     * @param requestBody The HTTP request object
+     * @return The string representation of the HTTP request body
+     * @throws test.test.client.ApiException If fail to serialize the request body object into a string
+     */
+    private String requestBodyToString(RequestBody requestBody) throws ApiException {
+        if (requestBody != null) {
+            try {
+                final Buffer buffer = new Buffer();
+                requestBody.writeTo(buffer);
+                return buffer.readUtf8();
+            } catch (final IOException e) {
+                throw new ApiException(e);
+            }
+        }
+
+        // empty http request body
+        return \\"\\";
+    }
+}
+",
+  "src/main/java/test/test/client/ApiException.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+import java.util.Map;
+import java.util.List;
+
+import javax.ws.rs.core.GenericType;
+
+/**
+ * <p>ApiException class.</p>
+ */
+@SuppressWarnings(\\"serial\\")
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+public class ApiException extends Exception {
+    private int code = 0;
+    private Map<String, List<String>> responseHeaders = null;
+    private String responseBody = null;
+ 
+    /**
+     * <p>Constructor for ApiException.</p>
+     */
+    public ApiException() {}
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param throwable a {@link java.lang.Throwable} object
+     */
+    public ApiException(Throwable throwable) {
+        super(throwable);
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param message the error message
+     */
+    public ApiException(String message) {
+        super(message);
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param message the error message
+     * @param throwable a {@link java.lang.Throwable} object
+     * @param code HTTP status code
+     * @param responseHeaders a {@link java.util.Map} of HTTP response headers
+     * @param responseBody the response body
+     */
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        super(message, throwable);
+        this.code = code;
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param message the error message
+     * @param code HTTP status code
+     * @param responseHeaders a {@link java.util.Map} of HTTP response headers
+     * @param responseBody the response body
+     */
+    public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(message, (Throwable) null, code, responseHeaders, responseBody);
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param message the error message
+     * @param throwable a {@link java.lang.Throwable} object
+     * @param code HTTP status code
+     * @param responseHeaders a {@link java.util.Map} of HTTP response headers
+     */
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
+        this(message, throwable, code, responseHeaders, null);
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param code HTTP status code
+     * @param responseHeaders a {@link java.util.Map} of HTTP response headers
+     * @param responseBody the response body
+     */
+    public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param code HTTP status code
+     * @param message a {@link java.lang.String} object
+     */
+    public ApiException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param code HTTP status code
+     * @param message the error message
+     * @param responseHeaders a {@link java.util.Map} of HTTP response headers
+     * @param responseBody the response body
+     */
+    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(code, message);
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
+
+    /**
+     * Get the HTTP status code.
+     *
+     * @return HTTP status code
+     */
+    public int getCode() {
+        return code;
+    }
+
+    /**
+     * Get the HTTP response headers.
+     *
+     * @return A map of list of string
+     */
+    public Map<String, List<String>> getResponseHeaders() {
+        return responseHeaders;
+    }
+
+    /**
+     * Get the HTTP response body.
+     *
+     * @return Response body in the form of string
+     */
+    public String getResponseBody() {
+        return responseBody;
+    }
+
+    /**
+     * Get the exception message including HTTP response data.
+     *
+     * @return The exception message
+     */
+    public String getMessage() {
+        return String.format(\\"Message: %s%nHTTP response code: %s%nHTTP response body: %s%nHTTP response headers: %s\\",
+                super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders());
+    }
+}
+",
+  "src/main/java/test/test/client/ApiResponse.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API response returned by API call.
+ */
+public class ApiResponse<T> {
+    final private int statusCode;
+    final private Map<String, List<String>> headers;
+    final private T data;
+
+    /**
+     * <p>Constructor for ApiResponse.</p>
+     *
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers) {
+        this(statusCode, headers, null);
+    }
+
+    /**
+     * <p>Constructor for ApiResponse.</p>
+     *
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     * @param data The object deserialized from response bod
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
+        this.statusCode = statusCode;
+        this.headers = headers;
+        this.data = data;
+    }
+
+    /**
+     * <p>Get the <code>status code</code>.</p>
+     *
+     * @return the status code
+     */
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    /**
+     * <p>Get the <code>headers</code>.</p>
+     *
+     * @return a {@link java.util.Map} of headers 
+     */
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
+
+    /**
+     * <p>Get the <code>data</code>.</p>
+     *
+     * @return the data
+     */
+    public T getData() {
+        return data;
+    }
+}
+",
+  "src/main/java/test/test/client/Configuration.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+public class Configuration {
+    private static ApiClient defaultApiClient = new ApiClient();
+
+    /**
+     * Get the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @return Default API client
+     */
+    public static ApiClient getDefaultApiClient() {
+        return defaultApiClient;
+    }
+
+    /**
+     * Set the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @param apiClient API client
+     */
+    public static void setDefaultApiClient(ApiClient apiClient) {
+        defaultApiClient = apiClient;
+    }
+}
+",
+  "src/main/java/test/test/client/GzipRequestInterceptor.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+import okhttp3.*;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.GzipSink;
+import okio.Okio;
+
+import java.io.IOException;
+
+/**
+ * Encodes request bodies using gzip.
+ *
+ * Taken from https://github.com/square/okhttp/issues/350
+ */
+class GzipRequestInterceptor implements Interceptor {
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request originalRequest = chain.request();
+        if (originalRequest.body() == null || originalRequest.header(\\"Content-Encoding\\") != null) {
+            return chain.proceed(originalRequest);
+        }
+
+        Request compressedRequest = originalRequest.newBuilder()
+                                                   .header(\\"Content-Encoding\\", \\"gzip\\")
+                                                   .method(originalRequest.method(), forceContentLength(gzip(originalRequest.body())))
+                                                   .build();
+        return chain.proceed(compressedRequest);
+    }
+
+    private RequestBody forceContentLength(final RequestBody requestBody) throws IOException {
+        final Buffer buffer = new Buffer();
+        requestBody.writeTo(buffer);
+        return new RequestBody() {
+            @Override
+            public MediaType contentType() {
+                return requestBody.contentType();
+            }
+
+            @Override
+            public long contentLength() {
+                return buffer.size();
+            }
+
+            @Override
+            public void writeTo(BufferedSink sink) throws IOException {
+                sink.write(buffer.snapshot());
+            }
+        };
+    }
+
+    private RequestBody gzip(final RequestBody body) {
+        return new RequestBody() {
+            @Override
+            public MediaType contentType() {
+                return body.contentType();
+            }
+
+            @Override
+            public long contentLength() {
+                return -1; // We don't know the compressed length in advance!
+            }
+
+            @Override
+            public void writeTo(BufferedSink sink) throws IOException {
+                BufferedSink gzipSink = Okio.buffer(new GzipSink(sink));
+                body.writeTo(gzipSink);
+                gzipSink.close();
+            }
+        };
+    }
+}
+",
+  "src/main/java/test/test/client/JSON.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.internal.bind.util.ISO8601Utils;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonElement;
+import io.gsonfire.GsonFireBuilder;
+import io.gsonfire.TypeSelector;
+
+import okio.ByteString;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.lang.reflect.Type;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
+
+/*
+ * A JSON utility class
+ *
+ * NOTE: in the future, this class may be converted to static, which may break
+ *       backward-compatibility
+ */
+public class JSON {
+    private static Gson gson;
+    private static boolean isLenientOnJson = false;
+    private static DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
+    private static SqlDateTypeAdapter sqlDateTypeAdapter = new SqlDateTypeAdapter();
+    private static OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter();
+    private static LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();
+    private static ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter();
+
+    @SuppressWarnings(\\"unchecked\\")
+    public static GsonBuilder createGson() {
+        GsonFireBuilder fireBuilder = new GsonFireBuilder()
+        ;
+        GsonBuilder builder = fireBuilder.createGsonBuilder();
+        return builder;
+    }
+
+    private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
+        JsonElement element = readElement.getAsJsonObject().get(discriminatorField);
+        if (null == element) {
+            throw new IllegalArgumentException(\\"missing discriminator field: <\\" + discriminatorField + \\">\\");
+        }
+        return element.getAsString();
+    }
+
+    /**
+     * Returns the Java class that implements the OpenAPI schema for the specified discriminator value.
+     *
+     * @param classByDiscriminatorValue The map of discriminator values to Java classes.
+     * @param discriminatorValue The value of the OpenAPI discriminator in the input data.
+     * @return The Java class that implements the OpenAPI schema
+     */
+    private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue);
+        if (null == clazz) {
+            throw new IllegalArgumentException(\\"cannot determine model class of name: <\\" + discriminatorValue + \\">\\");
+        }
+        return clazz;
+    }
+
+    {
+        GsonBuilder gsonBuilder = createGson();
+        gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
+        gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
+        gsonBuilder.registerTypeAdapter(OffsetDateTime.class, offsetDateTimeTypeAdapter);
+        gsonBuilder.registerTypeAdapter(LocalDate.class, localDateTypeAdapter);
+        gsonBuilder.registerTypeAdapter(byte[].class, byteArrayAdapter);
+        gson = gsonBuilder.create();
+    }
+
+    /**
+     * Get Gson.
+     *
+     * @return Gson
+     */
+    public static Gson getGson() {
+        return gson;
+    }
+
+    /**
+     * Set Gson.
+     *
+     * @param gson Gson
+     */
+    public static void setGson(Gson gson) {
+        JSON.gson = gson;
+    }
+
+    public static void setLenientOnJson(boolean lenientOnJson) {
+        isLenientOnJson = lenientOnJson;
+    }
+
+    /**
+     * Serialize the given Java object into JSON string.
+     *
+     * @param obj Object
+     * @return String representation of the JSON
+     */
+    public static String serialize(Object obj) {
+        return gson.toJson(obj);
+    }
+
+    /**
+     * Deserialize the given JSON string to Java object.
+     *
+     * @param <T>        Type
+     * @param body       The JSON string
+     * @param returnType The type to deserialize into
+     * @return The deserialized Java object
+     */
+    @SuppressWarnings(\\"unchecked\\")
+    public static <T> T deserialize(String body, Type returnType) {
+        try {
+            if (isLenientOnJson) {
+                JsonReader jsonReader = new JsonReader(new StringReader(body));
+                // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
+                jsonReader.setLenient(true);
+                return gson.fromJson(jsonReader, returnType);
+            } else {
+                return gson.fromJson(body, returnType);
+            }
+        } catch (JsonParseException e) {
+            // Fallback processing when failed to parse JSON form response body:
+            // return the response body string directly for the String return type;
+            if (returnType.equals(String.class)) {
+                return (T) body;
+            } else {
+                throw (e);
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for Byte Array type
+     */
+    public static class ByteArrayAdapter extends TypeAdapter<byte[]> {
+
+        @Override
+        public void write(JsonWriter out, byte[] value) throws IOException {
+            if (value == null) {
+                out.nullValue();
+            } else {
+                out.value(ByteString.of(value).base64());
+            }
+        }
+
+        @Override
+        public byte[] read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String bytesAsBase64 = in.nextString();
+                    ByteString byteString = ByteString.decodeBase64(bytesAsBase64);
+                    return byteString.toByteArray();
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for JSR310 OffsetDateTime type
+     */
+    public static class OffsetDateTimeTypeAdapter extends TypeAdapter<OffsetDateTime> {
+
+        private DateTimeFormatter formatter;
+
+        public OffsetDateTimeTypeAdapter() {
+            this(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+        }
+
+        public OffsetDateTimeTypeAdapter(DateTimeFormatter formatter) {
+            this.formatter = formatter;
+        }
+
+        public void setFormat(DateTimeFormatter dateFormat) {
+            this.formatter = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, OffsetDateTime date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                out.value(formatter.format(date));
+            }
+        }
+
+        @Override
+        public OffsetDateTime read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String date = in.nextString();
+                    if (date.endsWith(\\"+0000\\")) {
+                        date = date.substring(0, date.length()-5) + \\"Z\\";
+                    }
+                    return OffsetDateTime.parse(date, formatter);
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for JSR310 LocalDate type
+     */
+    public static class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+        private DateTimeFormatter formatter;
+
+        public LocalDateTypeAdapter() {
+            this(DateTimeFormatter.ISO_LOCAL_DATE);
+        }
+
+        public LocalDateTypeAdapter(DateTimeFormatter formatter) {
+            this.formatter = formatter;
+        }
+
+        public void setFormat(DateTimeFormatter dateFormat) {
+            this.formatter = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, LocalDate date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                out.value(formatter.format(date));
+            }
+        }
+
+        @Override
+        public LocalDate read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String date = in.nextString();
+                    return LocalDate.parse(date, formatter);
+            }
+        }
+    }
+
+    public static void setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
+        offsetDateTimeTypeAdapter.setFormat(dateFormat);
+    }
+
+    public static void setLocalDateFormat(DateTimeFormatter dateFormat) {
+        localDateTypeAdapter.setFormat(dateFormat);
+    }
+
+    /**
+     * Gson TypeAdapter for java.sql.Date type
+     * If the dateFormat is null, a simple \\"yyyy-MM-dd\\" format will be used
+     * (more efficient than SimpleDateFormat).
+     */
+    public static class SqlDateTypeAdapter extends TypeAdapter<java.sql.Date> {
+
+        private DateFormat dateFormat;
+
+        public SqlDateTypeAdapter() {}
+
+        public SqlDateTypeAdapter(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        public void setFormat(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, java.sql.Date date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                String value;
+                if (dateFormat != null) {
+                    value = dateFormat.format(date);
+                } else {
+                    value = date.toString();
+                }
+                out.value(value);
+            }
+        }
+
+        @Override
+        public java.sql.Date read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String date = in.nextString();
+                    try {
+                        if (dateFormat != null) {
+                            return new java.sql.Date(dateFormat.parse(date).getTime());
+                        }
+                        return new java.sql.Date(ISO8601Utils.parse(date, new ParsePosition(0)).getTime());
+                    } catch (ParseException e) {
+                        throw new JsonParseException(e);
+                    }
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for java.util.Date type
+     * If the dateFormat is null, ISO8601Utils will be used.
+     */
+    public static class DateTypeAdapter extends TypeAdapter<Date> {
+
+        private DateFormat dateFormat;
+
+        public DateTypeAdapter() {}
+
+        public DateTypeAdapter(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        public void setFormat(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, Date date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                String value;
+                if (dateFormat != null) {
+                    value = dateFormat.format(date);
+                } else {
+                    value = ISO8601Utils.format(date, true);
+                }
+                out.value(value);
+            }
+        }
+
+        @Override
+        public Date read(JsonReader in) throws IOException {
+            try {
+                switch (in.peek()) {
+                    case NULL:
+                        in.nextNull();
+                        return null;
+                    default:
+                        String date = in.nextString();
+                        try {
+                            if (dateFormat != null) {
+                                return dateFormat.parse(date);
+                            }
+                            return ISO8601Utils.parse(date, new ParsePosition(0));
+                        } catch (ParseException e) {
+                            throw new JsonParseException(e);
+                        }
+                }
+            } catch (IllegalArgumentException e) {
+                throw new JsonParseException(e);
+            }
+        }
+    }
+
+    public static void setDateFormat(DateFormat dateFormat) {
+        dateTypeAdapter.setFormat(dateFormat);
+    }
+
+    public static void setSqlDateFormat(DateFormat dateFormat) {
+        sqlDateTypeAdapter.setFormat(dateFormat);
+    }
+}
+",
+  "src/main/java/test/test/client/Pair.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+public class Pair {
+    private String name = \\"\\";
+    private String value = \\"\\";
+
+    public Pair (String name, String value) {
+        setName(name);
+        setValue(value);
+    }
+
+    private void setName(String name) {
+        if (!isValidString(name)) {
+            return;
+        }
+
+        this.name = name;
+    }
+
+    private void setValue(String value) {
+        if (!isValidString(value)) {
+            return;
+        }
+
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    private boolean isValidString(String arg) {
+        if (arg == null) {
+            return false;
+        }
+
+        return true;
+    }
+}
+",
+  "src/main/java/test/test/client/ProgressRequestBody.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+import java.io.IOException;
+
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.ForwardingSink;
+import okio.Okio;
+import okio.Sink;
+
+public class ProgressRequestBody extends RequestBody {
+
+    private final RequestBody requestBody;
+
+    private final ApiCallback callback;
+
+    public ProgressRequestBody(RequestBody requestBody, ApiCallback callback) {
+        this.requestBody = requestBody;
+        this.callback = callback;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return requestBody.contentType();
+    }
+
+    @Override
+    public long contentLength() throws IOException {
+        return requestBody.contentLength();
+    }
+
+    @Override
+    public void writeTo(BufferedSink sink) throws IOException {
+        BufferedSink bufferedSink = Okio.buffer(sink(sink));
+        requestBody.writeTo(bufferedSink);
+        bufferedSink.flush();
+    }
+
+    private Sink sink(Sink sink) {
+        return new ForwardingSink(sink) {
+
+            long bytesWritten = 0L;
+            long contentLength = 0L;
+
+            @Override
+            public void write(Buffer source, long byteCount) throws IOException {
+                super.write(source, byteCount);
+                if (contentLength == 0) {
+                    contentLength = contentLength();
+                }
+
+                bytesWritten += byteCount;
+                callback.onUploadProgress(bytesWritten, contentLength, bytesWritten == contentLength);
+            }
+        };
+    }
+}
+",
+  "src/main/java/test/test/client/ProgressResponseBody.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
+
+import java.io.IOException;
+
+import okio.Buffer;
+import okio.BufferedSource;
+import okio.ForwardingSource;
+import okio.Okio;
+import okio.Source;
+
+public class ProgressResponseBody extends ResponseBody {
+
+    private final ResponseBody responseBody;
+    private final ApiCallback callback;
+    private BufferedSource bufferedSource;
+
+    public ProgressResponseBody(ResponseBody responseBody, ApiCallback callback) {
+        this.responseBody = responseBody;
+        this.callback = callback;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return responseBody.contentType();
+    }
+
+    @Override
+    public long contentLength() {
+        return responseBody.contentLength();
+    }
+
+    @Override
+    public BufferedSource source() {
+        if (bufferedSource == null) {
+            bufferedSource = Okio.buffer(source(responseBody.source()));
+        }
+        return bufferedSource;
+    }
+
+    private Source source(Source source) {
+        return new ForwardingSource(source) {
+            long totalBytesRead = 0L;
+
+            @Override
+            public long read(Buffer sink, long byteCount) throws IOException {
+                long bytesRead = super.read(sink, byteCount);
+                // read() returns the number of bytes read, or -1 if this source is exhausted.
+                totalBytesRead += bytesRead != -1 ? bytesRead : 0;
+                callback.onDownloadProgress(totalBytesRead, responseBody.contentLength(), bytesRead == -1);
+                return bytesRead;
+            }
+        };
+    }
+}
+",
+  "src/main/java/test/test/client/ServerConfiguration.java": "package test.test.client;
+
+import java.util.Map;
+
+/**
+ * Representing a Server configuration.
+ */
+public class ServerConfiguration {
+    public String URL;
+    public String description;
+    public Map<String, ServerVariable> variables;
+
+    /**
+     * @param URL A URL to the target host.
+     * @param description A description of the host designated by the URL.
+     * @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template.
+     */
+    public ServerConfiguration(String URL, String description, Map<String, ServerVariable> variables) {
+        this.URL = URL;
+        this.description = description;
+        this.variables = variables;
+    }
+
+    /**
+     * Format URL template using given variables.
+     *
+     * @param variables A map between a variable name and its value.
+     * @return Formatted URL.
+     */
+    public String URL(Map<String, String> variables) {
+        String url = this.URL;
+
+        // go through variables and replace placeholders
+        for (Map.Entry<String, ServerVariable> variable: this.variables.entrySet()) {
+            String name = variable.getKey();
+            ServerVariable serverVariable = variable.getValue();
+            String value = serverVariable.defaultValue;
+
+            if (variables != null && variables.containsKey(name)) {
+                value = variables.get(name);
+                if (serverVariable.enumValues.size() > 0 && !serverVariable.enumValues.contains(value)) {
+                    throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
+                }
+            }
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
+        }
+        return url;
+    }
+
+    /**
+     * Format URL template using default server variables.
+     *
+     * @return Formatted URL.
+     */
+    public String URL() {
+        return URL(null);
+    }
+}
+",
+  "src/main/java/test/test/client/ServerVariable.java": "package test.test.client;
+
+import java.util.HashSet;
+
+/**
+ * Representing a Server Variable for server URL template substitution.
+ */
+public class ServerVariable {
+    public String description;
+    public String defaultValue;
+    public HashSet<String> enumValues = null;
+
+    /**
+     * @param description A description for the server variable.
+     * @param defaultValue The default value to use for substitution.
+     * @param enumValues An enumeration of string values to be used if the substitution options are from a limited set.
+     */
+    public ServerVariable(String description, String defaultValue, HashSet<String> enumValues) {
+        this.description = description;
+        this.defaultValue = defaultValue;
+        this.enumValues = enumValues;
+    }
+}
+",
+  "src/main/java/test/test/client/StringUtil.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) {
+        return true;
+      }
+      if (value != null && value.equalsIgnoreCase(str)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) {
+      return \\"\\";
+    }
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+
+  /**
+   * Join a list of strings with the given separator.
+   *
+   * @param list      The list of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(Collection<String> list, String separator) {
+    Iterator<String> iterator = list.iterator();
+    StringBuilder out = new StringBuilder();
+    if (iterator.hasNext()) {
+      out.append(iterator.next());
+    }
+    while (iterator.hasNext()) {
+      out.append(separator).append(iterator.next());
+    }
+    return out.toString();
+  }
+}
+",
+  "src/main/java/test/test/client/api/DefaultApi.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.api;
+
+import test.test.client.ApiCallback;
+import test.test.client.ApiClient;
+import test.test.client.ApiException;
+import test.test.client.ApiResponse;
+import test.test.client.Configuration;
+import test.test.client.Pair;
+import test.test.client.ProgressRequestBody;
+import test.test.client.ProgressResponseBody;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.io.IOException;
+
+
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.GenericType;
+
+public class DefaultApi {
+    private ApiClient localVarApiClient;
+    private int localHostIndex;
+    private String localCustomBaseUrl;
+
+    public DefaultApi() {
+        this(Configuration.getDefaultApiClient());
+    }
+
+    public DefaultApi(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
+    }
+
+    public ApiClient getApiClient() {
+        return localVarApiClient;
+    }
+
+    public void setApiClient(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
+    }
+
+    public int getHostIndex() {
+        return localHostIndex;
+    }
+
+    public void setHostIndex(int hostIndex) {
+        this.localHostIndex = hostIndex;
+    }
+
+    public String getCustomBaseUrl() {
+        return localCustomBaseUrl;
+    }
+
+    public void setCustomBaseUrl(String customBaseUrl) {
+        this.localCustomBaseUrl = customBaseUrl;
+    }
+
+    private okhttp3.Call neitherCall(final ApiCallback _callback) throws ApiException {
+        String basePath = null;
+        // Operation Servers
+        String[] localBasePaths = new String[] {  };
+
+        // Determine Base Path to Use
+        if (localCustomBaseUrl != null){
+            basePath = localCustomBaseUrl;
+        } else if ( localBasePaths.length > 0 ) {
+            basePath = localBasePaths[localHostIndex];
+        } else {
+            basePath = null;
+        }
+
+        Object localVarPostBody = null;
+
+        // create path and map variables
+        String localVarPath = \\"/neither\\";
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+        };
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put(\\"Accept\\", localVarAccept);
+        }
+
+        final String[] localVarContentTypes = {
+        };
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        if (localVarContentType != null) {
+            localVarHeaderParams.put(\\"Content-Type\\", localVarContentType);
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return localVarApiClient.buildCall(basePath, localVarPath, \\"GET\\", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
+    }
+
+    @SuppressWarnings(\\"rawtypes\\")
+    private okhttp3.Call neitherValidateBeforeCall(final ApiCallback _callback) throws ApiException {
+        return neitherCall(_callback);
+
+    }
+
+
+    private ApiResponse<Void> neitherWithHttpInfo() throws ApiException {
+        okhttp3.Call localVarCall = neitherValidateBeforeCall(null);
+        return localVarApiClient.execute(localVarCall);
+    }
+
+    private okhttp3.Call neitherAsync(final ApiCallback<Void> _callback) throws ApiException {
+
+        okhttp3.Call localVarCall = neitherValidateBeforeCall(_callback);
+        localVarApiClient.executeAsync(localVarCall, _callback);
+        return localVarCall;
+    }
+
+    public class APIneitherRequest {
+
+        private APIneitherRequest() {
+        }
+
+        /**
+         * Build call for neither
+         * @param _callback ApiCallback API callback
+         * @return Call to execute
+         * @throws ApiException If fail to serialize the request body object
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
+            return neitherCall(_callback);
+        }
+
+        /**
+         * Execute neither request
+         * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public void execute() throws ApiException {
+            neitherWithHttpInfo();
+        }
+
+        /**
+         * Execute neither request with HTTP info returned
+         * @return ApiResponse&lt;Void&gt;
+         * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public ApiResponse<Void> executeWithHttpInfo() throws ApiException {
+            return neitherWithHttpInfo();
+        }
+
+        /**
+         * Execute neither request (asynchronously)
+         * @param _callback The callback to be executed when the API call finishes
+         * @return The request call
+         * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public okhttp3.Call executeAsync(final ApiCallback<Void> _callback) throws ApiException {
+            return neitherAsync(_callback);
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @return APIneitherRequest
+     * @http.response.details
+     <table summary=\\"Response Details\\" border=\\"1\\">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+     </table>
+     */
+    public APIneitherRequest neither() {
+        return new APIneitherRequest();
+    }
+}
+",
+  "src/main/java/test/test/client/api/DefaultApi/Handlers.java": "package test.test.client.api;
+
+import test.test.client.model.*;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.stream.Collectors;
+import java.io.UnsupportedEncodingException;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+
+
+import test.test.client.JSON;
+
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+public class Handlers {
+
+    static {
+        // JSON has a static instance of Gson which is instantiated lazily the first time it is initialised.
+        // Create an instance here to ensure that the static Gson instance is always available.
+        new JSON();
+    }
+
+    private static String decodeParameter(final String parameter) {
+        try {
+            return URLDecoder.decode(parameter, StandardCharsets.UTF_8.name());
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static Map<String, String> decodeRequestParameters(Map<String, String> parameters) {
+        Map<String, String> decodedParameters = new HashMap<>();
+        for(Map.Entry<String, String> parameter : parameters.entrySet()) {
+            decodedParameters.put(parameter.getKey(), decodeParameter(parameter.getValue()));
+        }
+        return decodedParameters;
+    }
+
+    private static Map<String, List<String>> decodeRequestArrayParameters(Map<String, List<String>> parameters) {
+        Map<String, List<String>> decodedParameters = new HashMap<>();
+        for(Map.Entry<String, List<String>> parameter : parameters.entrySet()) {
+            decodedParameters.put(parameter.getKey(), parameter.getValue().stream().map(Handlers::decodeParameter).collect(Collectors.toList()));
+        }
+        return decodedParameters;
+    }
+
+    private static <K, V> void putAllFromNullableMap(Map<K, V> source, Map<K, V> destination) {
+        if (source != null) {
+            destination.putAll(source);
+        }
+    }
+
+    private static String concatMethodAndPath(final String method, final String path) {
+        return String.format(\\"%s||%s\\", method.toLowerCase(), path);
+    }
+
+    private static <T, I> List<Interceptor<I>> getAnnotationInterceptors(Class<T> clazz) {
+        // Support specifying simple interceptors via the @Interceptors({ MyInterceptor.class, MyOtherInterceptor.class }) format
+        return clazz.isAnnotationPresent(Interceptors.class)
+                ? Arrays.stream(clazz.getAnnotation(Interceptors.class).value()).map(c -> {
+            try {
+                return (Interceptor<I>) c.getDeclaredConstructor().newInstance();
+            } catch (Exception e) {
+                throw new RuntimeException(String.format(
+                        \\"Cannot create instance of interceptor %s. Please ensure it has a public constructor \\" +
+                                \\"with no arguments, or override the getInterceptors method instead of using the annotation\\", c.getSimpleName()), e);
+            }
+        }).collect(Collectors.toList())
+                : new ArrayList<>();
+    }
+
+    /**
+     * Represents an HTTP response from an api operation
+     */
+    public static interface Response {
+        /**
+         * Returns the response body
+         */
+        String getBody();
+        /**
+         * Returns the response status code
+         */
+        int getStatusCode();
+        /**
+         * Returns the response headers
+         */
+        Map<String, String> getHeaders();
+    }
+
+    @lombok.experimental.SuperBuilder
+    @lombok.AllArgsConstructor
+    @lombok.Getter
+    public static class ApiResponse implements Response {
+        private String body;
+        private int statusCode;
+        private Map<String, String> headers;
+    }
+
+    /**
+     * Interceptors can perform generic operations on requests and/or responses, optionally delegating to the remainder
+     * of the request chain.
+     */
+    public static interface Interceptor<TInput> {
+        /**
+         * Handle a request. Usually the response from \`input.getChain().next(input)\` is returned to delegate to the
+         * remainder of the chain, however you may wish to return an alternative Response.
+         */
+        Response handle(ChainedRequestInput<TInput> input);
+    }
+
+    /**
+     * Use this annotation to add interceptors to the request handler. Interceptors used in the annotation must have a
+     * constructor with no arguments.
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.TYPE)
+    public static @interface Interceptors {
+        public Class<? extends Interceptor>[] value() default {};
+    }
+
+    /**
+     * A handler chain represents a series of interceptors, which may or may not delegate to following interceptors.
+     * The lambda handler is always the last method in the chain.
+     */
+    public static interface HandlerChain<TInput> {
+        /**
+         * Delegate to the remainder of the handler chain
+         */
+        Response next(ChainedRequestInput<TInput> input);
+    }
+
+    /**
+     * Defines the input for a request.
+     */
+    public static interface RequestInput<TInput> {
+        /**
+         * The raw event from API Gateway
+         */
+        APIGatewayProxyRequestEvent getEvent();
+        /**
+         * Lambda execution context
+         */
+        Context getContext();
+        /**
+         * Demarshalled request input
+         */
+        TInput getInput();
+        /**
+         * Storage for arbitrary interceptor context for the lifetime of the request. Set and get values to pass state
+         * between interceptors or to the final handler.
+         */
+        Map<String, Object> getInterceptorContext();
+    }
+
+    /**
+     * Reqeust input with a handler chain
+     */
+    public static interface ChainedRequestInput<TInput> extends RequestInput<TInput> {
+        /**
+         * The chain for handling requests
+         */
+        HandlerChain<TInput> getChain();
+    }
+
+    private static <TInput> HandlerChain<TInput> buildHandlerChain(final List<Interceptor<TInput>> interceptors, final HandlerChain<TInput> baseChain) {
+        if (interceptors.isEmpty()) {
+            return baseChain;
+        } else {
+            Interceptor<TInput> interceptor = interceptors.get(0);
+            HandlerChain<TInput> remainingChain = buildHandlerChain(interceptors.subList(1, interceptors.size()), baseChain);
+            return new HandlerChain<TInput>() {
+                @Override
+                public Response next(ChainedRequestInput<TInput> input) {
+                    return interceptor.handle(new ChainedRequestInput<TInput>() {
+                        @Override
+                        public APIGatewayProxyRequestEvent getEvent() {
+                            return input.getEvent();
+                        }
+
+                        @Override
+                        public Context getContext() {
+                            return input.getContext();
+                        }
+
+                        @Override
+                        public TInput getInput() {
+                            return input.getInput();
+                        }
+
+                        @Override
+                        public HandlerChain<TInput> getChain() {
+                            return remainingChain;
+                        }
+
+                        @Override
+                        public Map<String, Object> getInterceptorContext() {
+                            return input.getInterceptorContext();
+                        }
+                    });
+                }
+            };
+        }
+    }
+
+    /**
+     * Response for the neither operation
+     */
+    public static interface NeitherResponse extends Response {}
+
+    /**
+     * Response with status code 200 for the neither operation
+     */
+    public static class Neither200Response implements NeitherResponse {
+        private String body;
+        private Map<String, String> headers;
+
+        private Neither200Response(final Map<String, String> headers) {
+            this.body = \\"\\";
+            this.headers = headers;
+        }
+
+        @Override
+        public int getStatusCode() {
+            return 200;
+        }
+
+        @Override
+        public String getBody() {
+            return this.body;
+        }
+
+        @Override
+        public Map<String, String> getHeaders() {
+            return this.headers;
+        }
+
+        /**
+         * Create a Neither200Response without a body
+         */
+        public static Neither200Response of() {
+            return new Neither200Response(new HashMap<>());
+        }
+
+        /**
+         * Create a Neither200Response without a body and headers
+         */
+        public static Neither200Response of(final Map<String, String> headers) {
+            return new Neither200Response(headers);
+        }
+    }
+
+    /**
+     * Single-value query and path parameters for the neither operation
+     */
+    public static class NeitherRequestParameters {
+
+        public NeitherRequestParameters(final APIGatewayProxyRequestEvent event) {
+            Map<String, String> parameters = new HashMap<>();
+            putAllFromNullableMap(event.getPathParameters(), parameters);
+            putAllFromNullableMap(event.getQueryStringParameters(), parameters);
+            Map<String, String> decodedParameters = decodeRequestParameters(parameters);
+
+        }
+
+    }
+
+    /**
+     * Multi-value query parameters for the neither operation
+     */
+    public static class NeitherRequestArrayParameters {
+
+        public NeitherRequestArrayParameters(final APIGatewayProxyRequestEvent event) {
+            Map<String, List<String>> parameters = new HashMap<>();
+            putAllFromNullableMap(event.getMultiValueQueryStringParameters(), parameters);
+            Map<String, List<String>> decodedParameters = decodeRequestArrayParameters(parameters);
+
+        }
+
+    }
+
+    /**
+     * Input for the neither operation
+     */
+    public static class NeitherInput {
+        private NeitherRequestParameters requestParameters;
+        private NeitherRequestArrayParameters requestArrayParameters;
+
+        public NeitherInput(final APIGatewayProxyRequestEvent event) {
+            this.requestParameters = new NeitherRequestParameters(event);
+            this.requestArrayParameters = new NeitherRequestArrayParameters(event);
+        }
+
+        public NeitherRequestParameters getRequestParameters() {
+            return this.requestParameters;
+        }
+
+        public NeitherRequestArrayParameters getRequestArrayParameters() {
+            return this.requestArrayParameters;
+        }
+
+    }
+
+    /**
+     * Full request input for the neither operation, including the raw API Gateway event
+     */
+    public static class NeitherRequestInput implements RequestInput<NeitherInput> {
+        private APIGatewayProxyRequestEvent event;
+        private Context context;
+        private Map<String, Object> interceptorContext;
+        private NeitherInput input;
+
+        public NeitherRequestInput(final APIGatewayProxyRequestEvent event, final Context context, final Map<String, Object> interceptorContext, final NeitherInput input) {
+            this.event = event;
+            this.context = context;
+            this.interceptorContext = interceptorContext;
+            this.input = input;
+        }
+
+        /**
+         * Returns the typed request input, with path, query and body parameters
+         */
+        public NeitherInput getInput() {
+            return this.input;
+        }
+
+        /**
+         * Returns the raw API Gateway event
+         */
+        public APIGatewayProxyRequestEvent getEvent() {
+            return this.event;
+        }
+
+        /**
+         * Returns the lambda context
+         */
+        public Context getContext() {
+            return this.context;
+        }
+
+        /**
+         * Returns the interceptor context, which may contain values set by request interceptors
+         */
+        public Map<String, Object> getInterceptorContext() {
+            return this.interceptorContext;
+        }
+    }
+
+    /**
+     * Lambda handler wrapper for the neither operation
+     */
+    public static abstract class Neither implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+        /**
+         * Handle the request for the neither operation
+         */
+        public abstract NeitherResponse handle(final NeitherRequestInput request);
+
+        /**
+         * For more complex interceptors that require instantiation with parameters, you may override this method to
+         * return a list of instantiated interceptors. For simple interceptors with no need for constructor arguments,
+         * prefer the @Interceptors annotation.
+         */
+        public List<Interceptor<NeitherInput>> getInterceptors() {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent event, final Context context) {
+            return this.handleRequestWithAdditionalInterceptors(event, context, new ArrayList<>());
+        }
+
+        public APIGatewayProxyResponseEvent handleRequestWithAdditionalInterceptors(final APIGatewayProxyRequestEvent event, final Context context, final List<Interceptor<NeitherInput>> additionalInterceptors) {
+            final Map<String, Object> interceptorContext = new HashMap<>();
+
+            List<Interceptor<NeitherInput>> interceptors = new ArrayList<>();
+            interceptors.addAll(additionalInterceptors);
+
+            List<Interceptor<NeitherInput>> annotationInterceptors = getAnnotationInterceptors(this.getClass());
+
+            interceptors.addAll(annotationInterceptors);
+            interceptors.addAll(this.getInterceptors());
+
+            final HandlerChain chain = buildHandlerChain(interceptors, new HandlerChain<NeitherInput>() {
+                @Override
+                public Response next(ChainedRequestInput<NeitherInput> input) {
+                    return handle(new NeitherRequestInput(input.getEvent(), input.getContext(), input.getInterceptorContext(), input.getInput()));
+                }
+            });
+
+            final Response response = chain.next(new ChainedRequestInput<NeitherInput>() {
+                @Override
+                public HandlerChain getChain() {
+                    // The chain's next method ignores the chain given as input, and is pre-built to follow the remaining
+                    // chain.
+                    return null;
+                }
+
+                @Override
+                public APIGatewayProxyRequestEvent getEvent() {
+                    return event;
+                }
+
+                @Override
+                public Context getContext() {
+                    return context;
+                }
+
+                @Override
+                public NeitherInput getInput() {
+                    return new NeitherInput(event);
+                }
+
+                @Override
+                public Map<String, Object> getInterceptorContext() {
+                    return interceptorContext;
+                }
+            });
+
+            return new APIGatewayProxyResponseEvent()
+                    .withStatusCode(response.getStatusCode())
+                    .withHeaders(response.getHeaders())
+                    .withBody(response.getBody());
+        }
+    }
+
+    /**
+     * Response for the both operation
+     */
+    public static interface BothResponse extends Response {}
+
+    /**
+     * Response with status code 200 for the both operation
+     */
+    public static class Both200Response implements BothResponse {
+        private String body;
+        private Map<String, String> headers;
+
+        private Both200Response(final Map<String, String> headers) {
+            this.body = \\"\\";
+            this.headers = headers;
+        }
+
+        @Override
+        public int getStatusCode() {
+            return 200;
+        }
+
+        @Override
+        public String getBody() {
+            return this.body;
+        }
+
+        @Override
+        public Map<String, String> getHeaders() {
+            return this.headers;
+        }
+
+        /**
+         * Create a Both200Response without a body
+         */
+        public static Both200Response of() {
+            return new Both200Response(new HashMap<>());
+        }
+
+        /**
+         * Create a Both200Response without a body and headers
+         */
+        public static Both200Response of(final Map<String, String> headers) {
+            return new Both200Response(headers);
+        }
+    }
+
+    /**
+     * Single-value query and path parameters for the both operation
+     */
+    public static class BothRequestParameters {
+
+        public BothRequestParameters(final APIGatewayProxyRequestEvent event) {
+            Map<String, String> parameters = new HashMap<>();
+            putAllFromNullableMap(event.getPathParameters(), parameters);
+            putAllFromNullableMap(event.getQueryStringParameters(), parameters);
+            Map<String, String> decodedParameters = decodeRequestParameters(parameters);
+
+        }
+
+    }
+
+    /**
+     * Multi-value query parameters for the both operation
+     */
+    public static class BothRequestArrayParameters {
+
+        public BothRequestArrayParameters(final APIGatewayProxyRequestEvent event) {
+            Map<String, List<String>> parameters = new HashMap<>();
+            putAllFromNullableMap(event.getMultiValueQueryStringParameters(), parameters);
+            Map<String, List<String>> decodedParameters = decodeRequestArrayParameters(parameters);
+
+        }
+
+    }
+
+    /**
+     * Input for the both operation
+     */
+    public static class BothInput {
+        private BothRequestParameters requestParameters;
+        private BothRequestArrayParameters requestArrayParameters;
+
+        public BothInput(final APIGatewayProxyRequestEvent event) {
+            this.requestParameters = new BothRequestParameters(event);
+            this.requestArrayParameters = new BothRequestArrayParameters(event);
+        }
+
+        public BothRequestParameters getRequestParameters() {
+            return this.requestParameters;
+        }
+
+        public BothRequestArrayParameters getRequestArrayParameters() {
+            return this.requestArrayParameters;
+        }
+
+    }
+
+    /**
+     * Full request input for the both operation, including the raw API Gateway event
+     */
+    public static class BothRequestInput implements RequestInput<BothInput> {
+        private APIGatewayProxyRequestEvent event;
+        private Context context;
+        private Map<String, Object> interceptorContext;
+        private BothInput input;
+
+        public BothRequestInput(final APIGatewayProxyRequestEvent event, final Context context, final Map<String, Object> interceptorContext, final BothInput input) {
+            this.event = event;
+            this.context = context;
+            this.interceptorContext = interceptorContext;
+            this.input = input;
+        }
+
+        /**
+         * Returns the typed request input, with path, query and body parameters
+         */
+        public BothInput getInput() {
+            return this.input;
+        }
+
+        /**
+         * Returns the raw API Gateway event
+         */
+        public APIGatewayProxyRequestEvent getEvent() {
+            return this.event;
+        }
+
+        /**
+         * Returns the lambda context
+         */
+        public Context getContext() {
+            return this.context;
+        }
+
+        /**
+         * Returns the interceptor context, which may contain values set by request interceptors
+         */
+        public Map<String, Object> getInterceptorContext() {
+            return this.interceptorContext;
+        }
+    }
+
+    /**
+     * Lambda handler wrapper for the both operation
+     */
+    public static abstract class Both implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+        /**
+         * Handle the request for the both operation
+         */
+        public abstract BothResponse handle(final BothRequestInput request);
+
+        /**
+         * For more complex interceptors that require instantiation with parameters, you may override this method to
+         * return a list of instantiated interceptors. For simple interceptors with no need for constructor arguments,
+         * prefer the @Interceptors annotation.
+         */
+        public List<Interceptor<BothInput>> getInterceptors() {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent event, final Context context) {
+            return this.handleRequestWithAdditionalInterceptors(event, context, new ArrayList<>());
+        }
+
+        public APIGatewayProxyResponseEvent handleRequestWithAdditionalInterceptors(final APIGatewayProxyRequestEvent event, final Context context, final List<Interceptor<BothInput>> additionalInterceptors) {
+            final Map<String, Object> interceptorContext = new HashMap<>();
+
+            List<Interceptor<BothInput>> interceptors = new ArrayList<>();
+            interceptors.addAll(additionalInterceptors);
+
+            List<Interceptor<BothInput>> annotationInterceptors = getAnnotationInterceptors(this.getClass());
+
+            interceptors.addAll(annotationInterceptors);
+            interceptors.addAll(this.getInterceptors());
+
+            final HandlerChain chain = buildHandlerChain(interceptors, new HandlerChain<BothInput>() {
+                @Override
+                public Response next(ChainedRequestInput<BothInput> input) {
+                    return handle(new BothRequestInput(input.getEvent(), input.getContext(), input.getInterceptorContext(), input.getInput()));
+                }
+            });
+
+            final Response response = chain.next(new ChainedRequestInput<BothInput>() {
+                @Override
+                public HandlerChain getChain() {
+                    // The chain's next method ignores the chain given as input, and is pre-built to follow the remaining
+                    // chain.
+                    return null;
+                }
+
+                @Override
+                public APIGatewayProxyRequestEvent getEvent() {
+                    return event;
+                }
+
+                @Override
+                public Context getContext() {
+                    return context;
+                }
+
+                @Override
+                public BothInput getInput() {
+                    return new BothInput(event);
+                }
+
+                @Override
+                public Map<String, Object> getInterceptorContext() {
+                    return interceptorContext;
+                }
+            });
+
+            return new APIGatewayProxyResponseEvent()
+                    .withStatusCode(response.getStatusCode())
+                    .withHeaders(response.getHeaders())
+                    .withBody(response.getBody());
+        }
+    }
+
+    /**
+     * Response for the tag1 operation
+     */
+    public static interface Tag1Response extends Response {}
+
+    /**
+     * Response with status code 200 for the tag1 operation
+     */
+    public static class Tag1200Response implements Tag1Response {
+        private String body;
+        private Map<String, String> headers;
+
+        private Tag1200Response(final Map<String, String> headers) {
+            this.body = \\"\\";
+            this.headers = headers;
+        }
+
+        @Override
+        public int getStatusCode() {
+            return 200;
+        }
+
+        @Override
+        public String getBody() {
+            return this.body;
+        }
+
+        @Override
+        public Map<String, String> getHeaders() {
+            return this.headers;
+        }
+
+        /**
+         * Create a Tag1200Response without a body
+         */
+        public static Tag1200Response of() {
+            return new Tag1200Response(new HashMap<>());
+        }
+
+        /**
+         * Create a Tag1200Response without a body and headers
+         */
+        public static Tag1200Response of(final Map<String, String> headers) {
+            return new Tag1200Response(headers);
+        }
+    }
+
+    /**
+     * Single-value query and path parameters for the tag1 operation
+     */
+    public static class Tag1RequestParameters {
+
+        public Tag1RequestParameters(final APIGatewayProxyRequestEvent event) {
+            Map<String, String> parameters = new HashMap<>();
+            putAllFromNullableMap(event.getPathParameters(), parameters);
+            putAllFromNullableMap(event.getQueryStringParameters(), parameters);
+            Map<String, String> decodedParameters = decodeRequestParameters(parameters);
+
+        }
+
+    }
+
+    /**
+     * Multi-value query parameters for the tag1 operation
+     */
+    public static class Tag1RequestArrayParameters {
+
+        public Tag1RequestArrayParameters(final APIGatewayProxyRequestEvent event) {
+            Map<String, List<String>> parameters = new HashMap<>();
+            putAllFromNullableMap(event.getMultiValueQueryStringParameters(), parameters);
+            Map<String, List<String>> decodedParameters = decodeRequestArrayParameters(parameters);
+
+        }
+
+    }
+
+    /**
+     * Input for the tag1 operation
+     */
+    public static class Tag1Input {
+        private Tag1RequestParameters requestParameters;
+        private Tag1RequestArrayParameters requestArrayParameters;
+
+        public Tag1Input(final APIGatewayProxyRequestEvent event) {
+            this.requestParameters = new Tag1RequestParameters(event);
+            this.requestArrayParameters = new Tag1RequestArrayParameters(event);
+        }
+
+        public Tag1RequestParameters getRequestParameters() {
+            return this.requestParameters;
+        }
+
+        public Tag1RequestArrayParameters getRequestArrayParameters() {
+            return this.requestArrayParameters;
+        }
+
+    }
+
+    /**
+     * Full request input for the tag1 operation, including the raw API Gateway event
+     */
+    public static class Tag1RequestInput implements RequestInput<Tag1Input> {
+        private APIGatewayProxyRequestEvent event;
+        private Context context;
+        private Map<String, Object> interceptorContext;
+        private Tag1Input input;
+
+        public Tag1RequestInput(final APIGatewayProxyRequestEvent event, final Context context, final Map<String, Object> interceptorContext, final Tag1Input input) {
+            this.event = event;
+            this.context = context;
+            this.interceptorContext = interceptorContext;
+            this.input = input;
+        }
+
+        /**
+         * Returns the typed request input, with path, query and body parameters
+         */
+        public Tag1Input getInput() {
+            return this.input;
+        }
+
+        /**
+         * Returns the raw API Gateway event
+         */
+        public APIGatewayProxyRequestEvent getEvent() {
+            return this.event;
+        }
+
+        /**
+         * Returns the lambda context
+         */
+        public Context getContext() {
+            return this.context;
+        }
+
+        /**
+         * Returns the interceptor context, which may contain values set by request interceptors
+         */
+        public Map<String, Object> getInterceptorContext() {
+            return this.interceptorContext;
+        }
+    }
+
+    /**
+     * Lambda handler wrapper for the tag1 operation
+     */
+    public static abstract class Tag1 implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+        /**
+         * Handle the request for the tag1 operation
+         */
+        public abstract Tag1Response handle(final Tag1RequestInput request);
+
+        /**
+         * For more complex interceptors that require instantiation with parameters, you may override this method to
+         * return a list of instantiated interceptors. For simple interceptors with no need for constructor arguments,
+         * prefer the @Interceptors annotation.
+         */
+        public List<Interceptor<Tag1Input>> getInterceptors() {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent event, final Context context) {
+            return this.handleRequestWithAdditionalInterceptors(event, context, new ArrayList<>());
+        }
+
+        public APIGatewayProxyResponseEvent handleRequestWithAdditionalInterceptors(final APIGatewayProxyRequestEvent event, final Context context, final List<Interceptor<Tag1Input>> additionalInterceptors) {
+            final Map<String, Object> interceptorContext = new HashMap<>();
+
+            List<Interceptor<Tag1Input>> interceptors = new ArrayList<>();
+            interceptors.addAll(additionalInterceptors);
+
+            List<Interceptor<Tag1Input>> annotationInterceptors = getAnnotationInterceptors(this.getClass());
+
+            interceptors.addAll(annotationInterceptors);
+            interceptors.addAll(this.getInterceptors());
+
+            final HandlerChain chain = buildHandlerChain(interceptors, new HandlerChain<Tag1Input>() {
+                @Override
+                public Response next(ChainedRequestInput<Tag1Input> input) {
+                    return handle(new Tag1RequestInput(input.getEvent(), input.getContext(), input.getInterceptorContext(), input.getInput()));
+                }
+            });
+
+            final Response response = chain.next(new ChainedRequestInput<Tag1Input>() {
+                @Override
+                public HandlerChain getChain() {
+                    // The chain's next method ignores the chain given as input, and is pre-built to follow the remaining
+                    // chain.
+                    return null;
+                }
+
+                @Override
+                public APIGatewayProxyRequestEvent getEvent() {
+                    return event;
+                }
+
+                @Override
+                public Context getContext() {
+                    return context;
+                }
+
+                @Override
+                public Tag1Input getInput() {
+                    return new Tag1Input(event);
+                }
+
+                @Override
+                public Map<String, Object> getInterceptorContext() {
+                    return interceptorContext;
+                }
+            });
+
+            return new APIGatewayProxyResponseEvent()
+                    .withStatusCode(response.getStatusCode())
+                    .withHeaders(response.getHeaders())
+                    .withBody(response.getBody());
+        }
+    }
+
+    /**
+     * Response for the tag2 operation
+     */
+    public static interface Tag2Response extends Response {}
+
+    /**
+     * Response with status code 200 for the tag2 operation
+     */
+    public static class Tag2200Response implements Tag2Response {
+        private String body;
+        private Map<String, String> headers;
+
+        private Tag2200Response(final Map<String, String> headers) {
+            this.body = \\"\\";
+            this.headers = headers;
+        }
+
+        @Override
+        public int getStatusCode() {
+            return 200;
+        }
+
+        @Override
+        public String getBody() {
+            return this.body;
+        }
+
+        @Override
+        public Map<String, String> getHeaders() {
+            return this.headers;
+        }
+
+        /**
+         * Create a Tag2200Response without a body
+         */
+        public static Tag2200Response of() {
+            return new Tag2200Response(new HashMap<>());
+        }
+
+        /**
+         * Create a Tag2200Response without a body and headers
+         */
+        public static Tag2200Response of(final Map<String, String> headers) {
+            return new Tag2200Response(headers);
+        }
+    }
+
+    /**
+     * Single-value query and path parameters for the tag2 operation
+     */
+    public static class Tag2RequestParameters {
+
+        public Tag2RequestParameters(final APIGatewayProxyRequestEvent event) {
+            Map<String, String> parameters = new HashMap<>();
+            putAllFromNullableMap(event.getPathParameters(), parameters);
+            putAllFromNullableMap(event.getQueryStringParameters(), parameters);
+            Map<String, String> decodedParameters = decodeRequestParameters(parameters);
+
+        }
+
+    }
+
+    /**
+     * Multi-value query parameters for the tag2 operation
+     */
+    public static class Tag2RequestArrayParameters {
+
+        public Tag2RequestArrayParameters(final APIGatewayProxyRequestEvent event) {
+            Map<String, List<String>> parameters = new HashMap<>();
+            putAllFromNullableMap(event.getMultiValueQueryStringParameters(), parameters);
+            Map<String, List<String>> decodedParameters = decodeRequestArrayParameters(parameters);
+
+        }
+
+    }
+
+    /**
+     * Input for the tag2 operation
+     */
+    public static class Tag2Input {
+        private Tag2RequestParameters requestParameters;
+        private Tag2RequestArrayParameters requestArrayParameters;
+
+        public Tag2Input(final APIGatewayProxyRequestEvent event) {
+            this.requestParameters = new Tag2RequestParameters(event);
+            this.requestArrayParameters = new Tag2RequestArrayParameters(event);
+        }
+
+        public Tag2RequestParameters getRequestParameters() {
+            return this.requestParameters;
+        }
+
+        public Tag2RequestArrayParameters getRequestArrayParameters() {
+            return this.requestArrayParameters;
+        }
+
+    }
+
+    /**
+     * Full request input for the tag2 operation, including the raw API Gateway event
+     */
+    public static class Tag2RequestInput implements RequestInput<Tag2Input> {
+        private APIGatewayProxyRequestEvent event;
+        private Context context;
+        private Map<String, Object> interceptorContext;
+        private Tag2Input input;
+
+        public Tag2RequestInput(final APIGatewayProxyRequestEvent event, final Context context, final Map<String, Object> interceptorContext, final Tag2Input input) {
+            this.event = event;
+            this.context = context;
+            this.interceptorContext = interceptorContext;
+            this.input = input;
+        }
+
+        /**
+         * Returns the typed request input, with path, query and body parameters
+         */
+        public Tag2Input getInput() {
+            return this.input;
+        }
+
+        /**
+         * Returns the raw API Gateway event
+         */
+        public APIGatewayProxyRequestEvent getEvent() {
+            return this.event;
+        }
+
+        /**
+         * Returns the lambda context
+         */
+        public Context getContext() {
+            return this.context;
+        }
+
+        /**
+         * Returns the interceptor context, which may contain values set by request interceptors
+         */
+        public Map<String, Object> getInterceptorContext() {
+            return this.interceptorContext;
+        }
+    }
+
+    /**
+     * Lambda handler wrapper for the tag2 operation
+     */
+    public static abstract class Tag2 implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+        /**
+         * Handle the request for the tag2 operation
+         */
+        public abstract Tag2Response handle(final Tag2RequestInput request);
+
+        /**
+         * For more complex interceptors that require instantiation with parameters, you may override this method to
+         * return a list of instantiated interceptors. For simple interceptors with no need for constructor arguments,
+         * prefer the @Interceptors annotation.
+         */
+        public List<Interceptor<Tag2Input>> getInterceptors() {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent event, final Context context) {
+            return this.handleRequestWithAdditionalInterceptors(event, context, new ArrayList<>());
+        }
+
+        public APIGatewayProxyResponseEvent handleRequestWithAdditionalInterceptors(final APIGatewayProxyRequestEvent event, final Context context, final List<Interceptor<Tag2Input>> additionalInterceptors) {
+            final Map<String, Object> interceptorContext = new HashMap<>();
+
+            List<Interceptor<Tag2Input>> interceptors = new ArrayList<>();
+            interceptors.addAll(additionalInterceptors);
+
+            List<Interceptor<Tag2Input>> annotationInterceptors = getAnnotationInterceptors(this.getClass());
+
+            interceptors.addAll(annotationInterceptors);
+            interceptors.addAll(this.getInterceptors());
+
+            final HandlerChain chain = buildHandlerChain(interceptors, new HandlerChain<Tag2Input>() {
+                @Override
+                public Response next(ChainedRequestInput<Tag2Input> input) {
+                    return handle(new Tag2RequestInput(input.getEvent(), input.getContext(), input.getInterceptorContext(), input.getInput()));
+                }
+            });
+
+            final Response response = chain.next(new ChainedRequestInput<Tag2Input>() {
+                @Override
+                public HandlerChain getChain() {
+                    // The chain's next method ignores the chain given as input, and is pre-built to follow the remaining
+                    // chain.
+                    return null;
+                }
+
+                @Override
+                public APIGatewayProxyRequestEvent getEvent() {
+                    return event;
+                }
+
+                @Override
+                public Context getContext() {
+                    return context;
+                }
+
+                @Override
+                public Tag2Input getInput() {
+                    return new Tag2Input(event);
+                }
+
+                @Override
+                public Map<String, Object> getInterceptorContext() {
+                    return interceptorContext;
+                }
+            });
+
+            return new APIGatewayProxyResponseEvent()
+                    .withStatusCode(response.getStatusCode())
+                    .withHeaders(response.getHeaders())
+                    .withBody(response.getBody());
+        }
+    }
+
+    public static abstract class HandlerRouter implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+        private static final String neitherMethodAndPath = concatMethodAndPath(\\"GET\\", \\"/neither\\");
+        private static final String bothMethodAndPath = concatMethodAndPath(\\"GET\\", \\"/both\\");
+        private static final String tag1MethodAndPath = concatMethodAndPath(\\"GET\\", \\"/tag1\\");
+        private static final String tag2MethodAndPath = concatMethodAndPath(\\"GET\\", \\"/tag2\\");
+
+        private final Neither constructedNeither;
+        private final Both constructedBoth;
+        private final Tag1 constructedTag1;
+        private final Tag2 constructedTag2;
+
+        /**
+         * This method must return your implementation of the Neither operation
+         */
+        public abstract Neither neither();
+        /**
+         * This method must return your implementation of the Both operation
+         */
+        public abstract Both both();
+        /**
+         * This method must return your implementation of the Tag1 operation
+         */
+        public abstract Tag1 tag1();
+        /**
+         * This method must return your implementation of the Tag2 operation
+         */
+        public abstract Tag2 tag2();
+
+        private static enum Route {
+            neitherRoute,
+            bothRoute,
+            tag1Route,
+            tag2Route,
+        }
+
+        /**
+         * Map of method and path to the route to map to
+         */
+        private final Map<String, Route> routes = new HashMap<>();
+
+        public HandlerRouter() {
+            this.routes.put(neitherMethodAndPath, Route.neitherRoute);
+            this.routes.put(bothMethodAndPath, Route.bothRoute);
+            this.routes.put(tag1MethodAndPath, Route.tag1Route);
+            this.routes.put(tag2MethodAndPath, Route.tag2Route);
+            // Handlers are all constructed in the router's constructor such that lambda behaviour remains consistent;
+            // ie resources created in the constructor remain in memory between invocations.
+            // https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
+            this.constructedNeither = this.neither();
+            this.constructedBoth = this.both();
+            this.constructedTag1 = this.tag1();
+            this.constructedTag2 = this.tag2();
+        }
+
+        /**
+         * For more complex interceptors that require instantiation with parameters, you may override this method to
+         * return a list of instantiated interceptors. For simple interceptors with no need for constructor arguments,
+         * prefer the @Interceptors annotation.
+         */
+        public <T> List<Interceptor<T>> getInterceptors() {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent event, final Context context) {
+            String method = event.getRequestContext().getHttpMethod();
+            String path = event.getRequestContext().getResourcePath();
+            String methodAndPath = concatMethodAndPath(method, path);
+            Route route = this.routes.get(methodAndPath);
+
+            switch (route) {
+                case neitherRoute:
+                    List<Interceptor<NeitherInput>> neitherInterceptors = getAnnotationInterceptors(this.getClass());
+                    neitherInterceptors.addAll(this.getInterceptors());
+                    return this.constructedNeither.handleRequestWithAdditionalInterceptors(event, context, neitherInterceptors);
+                case bothRoute:
+                    List<Interceptor<BothInput>> bothInterceptors = getAnnotationInterceptors(this.getClass());
+                    bothInterceptors.addAll(this.getInterceptors());
+                    return this.constructedBoth.handleRequestWithAdditionalInterceptors(event, context, bothInterceptors);
+                case tag1Route:
+                    List<Interceptor<Tag1Input>> tag1Interceptors = getAnnotationInterceptors(this.getClass());
+                    tag1Interceptors.addAll(this.getInterceptors());
+                    return this.constructedTag1.handleRequestWithAdditionalInterceptors(event, context, tag1Interceptors);
+                case tag2Route:
+                    List<Interceptor<Tag2Input>> tag2Interceptors = getAnnotationInterceptors(this.getClass());
+                    tag2Interceptors.addAll(this.getInterceptors());
+                    return this.constructedTag2.handleRequestWithAdditionalInterceptors(event, context, tag2Interceptors);
+                default:
+                    throw new RuntimeException(String.format(\\"No registered handler for method {} and path {}\\", method, path));
+            }
+        }
+    }
+}",
+  "src/main/java/test/test/client/api/DefaultApi/OperationConfig.java": "package test.test.client.api;
+
+import test.test.client.model.*;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+// Generic type for object \\"keyed\\" by operation names
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+@lombok.Builder @lombok.Getter
+public class OperationConfig<T> {
+    private T neither;
+    private T both;
+    private T tag1;
+    private T tag2;
+
+    public Map<String, T> asMap() {
+        Map<String, T> map = new HashMap<>();
+        map.put(\\"neither\\", this.neither);
+        map.put(\\"both\\", this.both);
+        map.put(\\"tag1\\", this.tag1);
+        map.put(\\"tag2\\", this.tag2);
+        return map;
+    }
+}
+",
+  "src/main/java/test/test/client/api/DefaultApi/OperationLookup.java": "package test.test.client.api;
+
+import test.test.client.model.*;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+// Look up path and http method for a given operation name
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+public class OperationLookup {
+    /**
+     * Returns the operation lookup information for the OpenApiGatewayLambdaApi construct
+     */
+    public static Map<String, Map<String, String>> getOperationLookup() {
+        final Map<String, Map<String, String>> config = new HashMap<>();
+
+        config.put(\\"neither\\", new HashMap<String, String>() { { put(\\"path\\", \\"/neither\\"); put(\\"method\\", \\"GET\\"); } });
+        config.put(\\"both\\", new HashMap<String, String>() { { put(\\"path\\", \\"/both\\"); put(\\"method\\", \\"GET\\"); } });
+        config.put(\\"tag1\\", new HashMap<String, String>() { { put(\\"path\\", \\"/tag1\\"); put(\\"method\\", \\"GET\\"); } });
+        config.put(\\"tag2\\", new HashMap<String, String>() { { put(\\"path\\", \\"/tag2\\"); put(\\"method\\", \\"GET\\"); } });
+
+        return config;
+    }
+}
+",
+  "src/main/java/test/test/client/api/DefaultApi/Operations.java": "package test.test.client.api;
+
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+public class Operations {
+    /**
+     * Returns an OperationConfig Builder with all values populated with the given value.
+     * You can override specific values on the builder if you like.
+     * Make sure you call \`.build()\` at the end to construct the OperationConfig.
+     */
+    public static <T> OperationConfig.OperationConfigBuilder<T> all(final T value) {
+        return OperationConfig.<T>builder()
+                .neither(value)
+                .both(value)
+                .tag1(value)
+                .tag2(value)
+                ;
+    }
+}
+",
+  "src/main/java/test/test/client/api/Tag1Api.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.api;
+
+import test.test.client.ApiCallback;
+import test.test.client.ApiClient;
+import test.test.client.ApiException;
+import test.test.client.ApiResponse;
+import test.test.client.Configuration;
+import test.test.client.Pair;
+import test.test.client.ProgressRequestBody;
+import test.test.client.ProgressResponseBody;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.io.IOException;
+
+
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.GenericType;
+
+public class Tag1Api {
+    private ApiClient localVarApiClient;
+    private int localHostIndex;
+    private String localCustomBaseUrl;
+
+    public Tag1Api() {
+        this(Configuration.getDefaultApiClient());
+    }
+
+    public Tag1Api(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
+    }
+
+    public ApiClient getApiClient() {
+        return localVarApiClient;
+    }
+
+    public void setApiClient(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
+    }
+
+    public int getHostIndex() {
+        return localHostIndex;
+    }
+
+    public void setHostIndex(int hostIndex) {
+        this.localHostIndex = hostIndex;
+    }
+
+    public String getCustomBaseUrl() {
+        return localCustomBaseUrl;
+    }
+
+    public void setCustomBaseUrl(String customBaseUrl) {
+        this.localCustomBaseUrl = customBaseUrl;
+    }
+
+    private okhttp3.Call bothCall(final ApiCallback _callback) throws ApiException {
+        String basePath = null;
+        // Operation Servers
+        String[] localBasePaths = new String[] {  };
+
+        // Determine Base Path to Use
+        if (localCustomBaseUrl != null){
+            basePath = localCustomBaseUrl;
+        } else if ( localBasePaths.length > 0 ) {
+            basePath = localBasePaths[localHostIndex];
+        } else {
+            basePath = null;
+        }
+
+        Object localVarPostBody = null;
+
+        // create path and map variables
+        String localVarPath = \\"/both\\";
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+        };
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put(\\"Accept\\", localVarAccept);
+        }
+
+        final String[] localVarContentTypes = {
+        };
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        if (localVarContentType != null) {
+            localVarHeaderParams.put(\\"Content-Type\\", localVarContentType);
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return localVarApiClient.buildCall(basePath, localVarPath, \\"GET\\", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
+    }
+
+    @SuppressWarnings(\\"rawtypes\\")
+    private okhttp3.Call bothValidateBeforeCall(final ApiCallback _callback) throws ApiException {
+        return bothCall(_callback);
+
+    }
+
+
+    private ApiResponse<Void> bothWithHttpInfo() throws ApiException {
+        okhttp3.Call localVarCall = bothValidateBeforeCall(null);
+        return localVarApiClient.execute(localVarCall);
+    }
+
+    private okhttp3.Call bothAsync(final ApiCallback<Void> _callback) throws ApiException {
+
+        okhttp3.Call localVarCall = bothValidateBeforeCall(_callback);
+        localVarApiClient.executeAsync(localVarCall, _callback);
+        return localVarCall;
+    }
+
+    public class APIbothRequest {
+
+        private APIbothRequest() {
+        }
+
+        /**
+         * Build call for both
+         * @param _callback ApiCallback API callback
+         * @return Call to execute
+         * @throws ApiException If fail to serialize the request body object
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
+            return bothCall(_callback);
+        }
+
+        /**
+         * Execute both request
+         * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public void execute() throws ApiException {
+            bothWithHttpInfo();
+        }
+
+        /**
+         * Execute both request with HTTP info returned
+         * @return ApiResponse&lt;Void&gt;
+         * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public ApiResponse<Void> executeWithHttpInfo() throws ApiException {
+            return bothWithHttpInfo();
+        }
+
+        /**
+         * Execute both request (asynchronously)
+         * @param _callback The callback to be executed when the API call finishes
+         * @return The request call
+         * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public okhttp3.Call executeAsync(final ApiCallback<Void> _callback) throws ApiException {
+            return bothAsync(_callback);
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @return APIbothRequest
+     * @http.response.details
+     <table summary=\\"Response Details\\" border=\\"1\\">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+     </table>
+     */
+    public APIbothRequest both() {
+        return new APIbothRequest();
+    }
+    private okhttp3.Call tag1Call(final ApiCallback _callback) throws ApiException {
+        String basePath = null;
+        // Operation Servers
+        String[] localBasePaths = new String[] {  };
+
+        // Determine Base Path to Use
+        if (localCustomBaseUrl != null){
+            basePath = localCustomBaseUrl;
+        } else if ( localBasePaths.length > 0 ) {
+            basePath = localBasePaths[localHostIndex];
+        } else {
+            basePath = null;
+        }
+
+        Object localVarPostBody = null;
+
+        // create path and map variables
+        String localVarPath = \\"/tag1\\";
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+        };
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put(\\"Accept\\", localVarAccept);
+        }
+
+        final String[] localVarContentTypes = {
+        };
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        if (localVarContentType != null) {
+            localVarHeaderParams.put(\\"Content-Type\\", localVarContentType);
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return localVarApiClient.buildCall(basePath, localVarPath, \\"GET\\", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
+    }
+
+    @SuppressWarnings(\\"rawtypes\\")
+    private okhttp3.Call tag1ValidateBeforeCall(final ApiCallback _callback) throws ApiException {
+        return tag1Call(_callback);
+
+    }
+
+
+    private ApiResponse<Void> tag1WithHttpInfo() throws ApiException {
+        okhttp3.Call localVarCall = tag1ValidateBeforeCall(null);
+        return localVarApiClient.execute(localVarCall);
+    }
+
+    private okhttp3.Call tag1Async(final ApiCallback<Void> _callback) throws ApiException {
+
+        okhttp3.Call localVarCall = tag1ValidateBeforeCall(_callback);
+        localVarApiClient.executeAsync(localVarCall, _callback);
+        return localVarCall;
+    }
+
+    public class APItag1Request {
+
+        private APItag1Request() {
+        }
+
+        /**
+         * Build call for tag1
+         * @param _callback ApiCallback API callback
+         * @return Call to execute
+         * @throws ApiException If fail to serialize the request body object
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
+            return tag1Call(_callback);
+        }
+
+        /**
+         * Execute tag1 request
+         * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public void execute() throws ApiException {
+            tag1WithHttpInfo();
+        }
+
+        /**
+         * Execute tag1 request with HTTP info returned
+         * @return ApiResponse&lt;Void&gt;
+         * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public ApiResponse<Void> executeWithHttpInfo() throws ApiException {
+            return tag1WithHttpInfo();
+        }
+
+        /**
+         * Execute tag1 request (asynchronously)
+         * @param _callback The callback to be executed when the API call finishes
+         * @return The request call
+         * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public okhttp3.Call executeAsync(final ApiCallback<Void> _callback) throws ApiException {
+            return tag1Async(_callback);
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @return APItag1Request
+     * @http.response.details
+     <table summary=\\"Response Details\\" border=\\"1\\">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+     </table>
+     */
+    public APItag1Request tag1() {
+        return new APItag1Request();
+    }
+}
+",
+  "src/main/java/test/test/client/api/Tag2Api.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.api;
+
+import test.test.client.ApiCallback;
+import test.test.client.ApiClient;
+import test.test.client.ApiException;
+import test.test.client.ApiResponse;
+import test.test.client.Configuration;
+import test.test.client.Pair;
+import test.test.client.ProgressRequestBody;
+import test.test.client.ProgressResponseBody;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.io.IOException;
+
+
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.GenericType;
+
+public class Tag2Api {
+    private ApiClient localVarApiClient;
+    private int localHostIndex;
+    private String localCustomBaseUrl;
+
+    public Tag2Api() {
+        this(Configuration.getDefaultApiClient());
+    }
+
+    public Tag2Api(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
+    }
+
+    public ApiClient getApiClient() {
+        return localVarApiClient;
+    }
+
+    public void setApiClient(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
+    }
+
+    public int getHostIndex() {
+        return localHostIndex;
+    }
+
+    public void setHostIndex(int hostIndex) {
+        this.localHostIndex = hostIndex;
+    }
+
+    public String getCustomBaseUrl() {
+        return localCustomBaseUrl;
+    }
+
+    public void setCustomBaseUrl(String customBaseUrl) {
+        this.localCustomBaseUrl = customBaseUrl;
+    }
+
+    private okhttp3.Call tag2Call(final ApiCallback _callback) throws ApiException {
+        String basePath = null;
+        // Operation Servers
+        String[] localBasePaths = new String[] {  };
+
+        // Determine Base Path to Use
+        if (localCustomBaseUrl != null){
+            basePath = localCustomBaseUrl;
+        } else if ( localBasePaths.length > 0 ) {
+            basePath = localBasePaths[localHostIndex];
+        } else {
+            basePath = null;
+        }
+
+        Object localVarPostBody = null;
+
+        // create path and map variables
+        String localVarPath = \\"/tag2\\";
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+        };
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put(\\"Accept\\", localVarAccept);
+        }
+
+        final String[] localVarContentTypes = {
+        };
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        if (localVarContentType != null) {
+            localVarHeaderParams.put(\\"Content-Type\\", localVarContentType);
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return localVarApiClient.buildCall(basePath, localVarPath, \\"GET\\", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
+    }
+
+    @SuppressWarnings(\\"rawtypes\\")
+    private okhttp3.Call tag2ValidateBeforeCall(final ApiCallback _callback) throws ApiException {
+        return tag2Call(_callback);
+
+    }
+
+
+    private ApiResponse<Void> tag2WithHttpInfo() throws ApiException {
+        okhttp3.Call localVarCall = tag2ValidateBeforeCall(null);
+        return localVarApiClient.execute(localVarCall);
+    }
+
+    private okhttp3.Call tag2Async(final ApiCallback<Void> _callback) throws ApiException {
+
+        okhttp3.Call localVarCall = tag2ValidateBeforeCall(_callback);
+        localVarApiClient.executeAsync(localVarCall, _callback);
+        return localVarCall;
+    }
+
+    public class APItag2Request {
+
+        private APItag2Request() {
+        }
+
+        /**
+         * Build call for tag2
+         * @param _callback ApiCallback API callback
+         * @return Call to execute
+         * @throws ApiException If fail to serialize the request body object
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
+            return tag2Call(_callback);
+        }
+
+        /**
+         * Execute tag2 request
+         * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public void execute() throws ApiException {
+            tag2WithHttpInfo();
+        }
+
+        /**
+         * Execute tag2 request with HTTP info returned
+         * @return ApiResponse&lt;Void&gt;
+         * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public ApiResponse<Void> executeWithHttpInfo() throws ApiException {
+            return tag2WithHttpInfo();
+        }
+
+        /**
+         * Execute tag2 request (asynchronously)
+         * @param _callback The callback to be executed when the API call finishes
+         * @return The request call
+         * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+         * @http.response.details
+         <table summary=\\"Response Details\\" border=\\"1\\">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+         </table>
+         */
+        public okhttp3.Call executeAsync(final ApiCallback<Void> _callback) throws ApiException {
+            return tag2Async(_callback);
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @return APItag2Request
+     * @http.response.details
+     <table summary=\\"Response Details\\" border=\\"1\\">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
+     </table>
+     */
+    public APItag2Request tag2() {
+        return new APItag2Request();
+    }
+}
+",
+  "src/main/java/test/test/client/auth/ApiKeyAuth.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.auth;
+
+import test.test.client.ApiException;
+import test.test.client.Pair;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+public class ApiKeyAuth implements Authentication {
+  private final String location;
+  private final String paramName;
+
+  private String apiKey;
+  private String apiKeyPrefix;
+
+  public ApiKeyAuth(String location, String paramName) {
+    this.location = location;
+    this.paramName = paramName;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public String getParamName() {
+    return paramName;
+  }
+
+  public String getApiKey() {
+    return apiKey;
+  }
+
+  public void setApiKey(String apiKey) {
+    this.apiKey = apiKey;
+  }
+
+  public String getApiKeyPrefix() {
+    return apiKeyPrefix;
+  }
+
+  public void setApiKeyPrefix(String apiKeyPrefix) {
+    this.apiKeyPrefix = apiKeyPrefix;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
+                           String payload, String method, URI uri) throws ApiException {
+    if (apiKey == null) {
+      return;
+    }
+    String value;
+    if (apiKeyPrefix != null) {
+      value = apiKeyPrefix + \\" \\" + apiKey;
+    } else {
+      value = apiKey;
+    }
+    if (\\"query\\".equals(location)) {
+      queryParams.add(new Pair(paramName, value));
+    } else if (\\"header\\".equals(location)) {
+      headerParams.put(paramName, value);
+    } else if (\\"cookie\\".equals(location)) {
+      cookieParams.put(paramName, value);
+    }
+  }
+}
+",
+  "src/main/java/test/test/client/auth/Authentication.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.auth;
+
+import test.test.client.Pair;
+import test.test.client.ApiException;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.List;
+
+public interface Authentication {
+    /**
+     * Apply authentication settings to header and query params.
+     *
+     * @param queryParams List of query parameters
+     * @param headerParams Map of header parameters
+     * @param cookieParams Map of cookie parameters
+     * @param payload HTTP request body
+     * @param method HTTP method
+     * @param uri URI
+     * @throws ApiException if failed to update the parameters
+     */
+    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException;
+}
+",
+  "src/main/java/test/test/client/auth/HttpBasicAuth.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.auth;
+
+import test.test.client.Pair;
+import test.test.client.ApiException;
+
+import okhttp3.Credentials;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.List;
+
+import java.io.UnsupportedEncodingException;
+
+public class HttpBasicAuth implements Authentication {
+    private String username;
+    private String password;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
+                              String payload, String method, URI uri) throws ApiException {
+        if (username == null && password == null) {
+            return;
+        }
+        headerParams.put(\\"Authorization\\", Credentials.basic(
+            username == null ? \\"\\" : username,
+            password == null ? \\"\\" : password));
+    }
+}
+",
+  "src/main/java/test/test/client/auth/HttpBearerAuth.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.auth;
+
+import test.test.client.ApiException;
+import test.test.client.Pair;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+public class HttpBearerAuth implements Authentication {
+  private final String scheme;
+  private String bearerToken;
+
+  public HttpBearerAuth(String scheme) {
+    this.scheme = scheme;
+  }
+
+  /**
+   * Gets the token, which together with the scheme, will be sent as the value of the Authorization header.
+   *
+   * @return The bearer token
+   */
+  public String getBearerToken() {
+    return bearerToken;
+  }
+
+  /**
+   * Sets the token, which together with the scheme, will be sent as the value of the Authorization header.
+   *
+   * @param bearerToken The bearer token to send in the Authorization header
+   */
+  public void setBearerToken(String bearerToken) {
+    this.bearerToken = bearerToken;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
+                            String payload, String method, URI uri) throws ApiException {
+    if (bearerToken == null) {
+      return;
+    }
+
+    headerParams.put(\\"Authorization\\", (scheme != null ? upperCaseBearer(scheme) + \\" \\" : \\"\\") + bearerToken);
+  }
+
+  private static String upperCaseBearer(String scheme) {
+    return (\\"bearer\\".equalsIgnoreCase(scheme)) ? \\"Bearer\\" : scheme;
+  }
+}
+",
+  "src/main/java/test/test/client/model/AbstractOpenApiSchema.java": "/*
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package test.test.client.model;
+
+import test.test.client.ApiException;
+import java.util.Objects;
+import java.lang.reflect.Type;
+import java.util.Map;
+import javax.ws.rs.core.GenericType;
+
+//import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
+ */
+@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
+@javax.annotation.Generated(value = \\"org.openapitools.codegen.languages.JavaClientCodegen\\")
+public abstract class AbstractOpenApiSchema {
+
+    // store the actual instance of the schema/object
+    private Object instance;
+
+    // is nullable
+    private Boolean isNullable;
+
+    // schema type (e.g. oneOf, anyOf)
+    private final String schemaType;
+
+    public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
+        this.schemaType = schemaType;
+        this.isNullable = isNullable;
+    }
+
+    /**
+     * Get the list of oneOf/anyOf composed schemas allowed to be stored in this object
+     *
+     * @return an instance of the actual schema/object
+     */
+    public abstract Map<String, GenericType> getSchemas();
+
+    /**
+     * Get the actual instance
+     *
+     * @return an instance of the actual schema/object
+     */
+    //@JsonValue
+    public Object getActualInstance() {return instance;}
+
+    /**
+     * Set the actual instance
+     *
+     * @param instance the actual instance of the schema/object
+     */
+    public void setActualInstance(Object instance) {this.instance = instance;}
+
+    /**
+     * Get the instant recursively when the schemas defined in oneOf/anyof happen to be oneOf/anyOf schema as well
+     *
+     * @return an instance of the actual schema/object
+     */
+    public Object getActualInstanceRecursively() {
+        return getActualInstanceRecursively(this);
+    }
+
+    private Object getActualInstanceRecursively(AbstractOpenApiSchema object) {
+        if (object.getActualInstance() == null) {
+            return null;
+        } else if (object.getActualInstance() instanceof AbstractOpenApiSchema) {
+            return getActualInstanceRecursively((AbstractOpenApiSchema)object.getActualInstance());
+        } else {
+            return object.getActualInstance();
+        }
+    }
+
+    /**
+     * Get the schema type (e.g. anyOf, oneOf)
+     *
+     * @return the schema type
+     */
+    public String getSchemaType() {
+        return schemaType;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(\\"class \\").append(getClass()).append(\\" {\\\\n\\");
+        sb.append(\\"    instance: \\").append(toIndentedString(instance)).append(\\"\\\\n\\");
+        sb.append(\\"    isNullable: \\").append(toIndentedString(isNullable)).append(\\"\\\\n\\");
+        sb.append(\\"    schemaType: \\").append(toIndentedString(schemaType)).append(\\"\\\\n\\");
+        sb.append(\\"}\\");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return \\"null\\";
+        }
+        return o.toString().replace(\\"\\\\n\\", \\"\\\\n    \\");
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        AbstractOpenApiSchema a = (AbstractOpenApiSchema) o;
+        return Objects.equals(this.instance, a.instance) &&
+            Objects.equals(this.isNullable, a.isNullable) &&
+            Objects.equals(this.schemaType, a.schemaType);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(instance, isNullable, schemaType);
+    }
+
+    /**
+     * Is nullable
+     *
+     * @return true if it's nullable
+     */
+    public Boolean isNullable() {
+        if (Boolean.TRUE.equals(isNullable)) {
+            return Boolean.TRUE;
+        } else {
+            return Boolean.FALSE;
+        }
+    }
+
+
+
+}
+",
+  "src/test/java/org/acme/MyTest.java": "package org.acme;
+
+import org.junit.jupiter.api.Test;
+
+public class MyTest {
+  @Test
+  public void testHello() {
+    System.out.println(\\"Hello, world!\\");
+  }
+}",
+  "src/test/java/test/test/client/api/DefaultApiTest.java": "/*
+ * Multiple Tags Test
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: 1.0.0
@@ -7281,47 +15082,39 @@ public class ApiErrorTest {
  */
 
 
-package test.test.client.model;
+package test.test.client.api;
 
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
+import test.test.client.ApiException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
- * Model tests for TestRequest
+ * API tests for DefaultApi
  */
-public class TestRequestTest {
-    private final TestRequest model = new TestRequest();
+@Disabled
+public class DefaultApiTest {
 
-    /**
-     * Model tests for TestRequest
-     */
-    @Test
-    public void testTestRequest() {
-        // TODO: test TestRequest
-    }
+    private final DefaultApi api = new DefaultApi();
 
     /**
-     * Test the property 'myInput'
+     * @throws ApiException if the Api call fails
      */
     @Test
-    public void myInputTest() {
-        // TODO: test myInput
+    public void neitherTest() throws ApiException {
+        api.neither()
+                .execute();
+        // TODO: test validations
     }
 
 }
 ",
-  "src/test/java/test/test/client/model/TestResponseMessagesInnerTest.java": "/*
- * Example API
+  "src/test/java/test/test/client/api/Tag1ApiTest.java": "/*
+ * Multiple Tags Test
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: 1.0.0
@@ -7333,54 +15126,49 @@ public class TestRequestTest {
  */
 
 
-package test.test.client.model;
+package test.test.client.api;
 
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
+import test.test.client.ApiException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
- * Model tests for TestResponseMessagesInner
+ * API tests for Tag1Api
  */
-public class TestResponseMessagesInnerTest {
-    private final TestResponseMessagesInner model = new TestResponseMessagesInner();
+@Disabled
+public class Tag1ApiTest {
 
-    /**
-     * Model tests for TestResponseMessagesInner
-     */
-    @Test
-    public void testTestResponseMessagesInner() {
-        // TODO: test TestResponseMessagesInner
-    }
+    private final Tag1Api api = new Tag1Api();
 
     /**
-     * Test the property 'message'
+     * @throws ApiException if the Api call fails
      */
     @Test
-    public void messageTest() {
-        // TODO: test message
+    public void bothTest() throws ApiException {
+        api.both()
+                .execute();
+        // TODO: test validations
     }
 
     /**
-     * Test the property 'id'
+     * @throws ApiException if the Api call fails
      */
     @Test
-    public void idTest() {
-        // TODO: test id
+    public void tag1Test() throws ApiException {
+        api.tag1()
+                .execute();
+        // TODO: test validations
     }
 
 }
 ",
-  "src/test/java/test/test/client/model/TestResponseTest.java": "/*
- * Example API
+  "src/test/java/test/test/client/api/Tag2ApiTest.java": "/*
+ * Multiple Tags Test
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: 1.0.0
@@ -7392,43 +15180,33 @@ public class TestResponseMessagesInnerTest {
  */
 
 
-package test.test.client.model;
+package test.test.client.api;
 
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import test.test.client.model.TestResponseMessagesInner;
+import test.test.client.ApiException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
- * Model tests for TestResponse
+ * API tests for Tag2Api
  */
-public class TestResponseTest {
-    private final TestResponse model = new TestResponse();
+@Disabled
+public class Tag2ApiTest {
 
-    /**
-     * Model tests for TestResponse
-     */
-    @Test
-    public void testTestResponse() {
-        // TODO: test TestResponse
-    }
+    private final Tag2Api api = new Tag2Api();
 
     /**
-     * Test the property 'messages'
+     * @throws ApiException if the Api call fails
      */
     @Test
-    public void messagesTest() {
-        // TODO: test messages
+    public void tag2Test() throws ApiException {
+        api.tag2()
+                .execute();
+        // TODO: test validations
     }
 
 }
@@ -7436,8 +15214,6 @@ public class TestResponseTest {
 }
 `;
 
-exports[`Generated Java Client Code Unit Tests Multiple Tags 1`] = `"Operations with multiple tags are not yet supported, please tag operations with at most one tag. The following operations have multiple tags: get /both"`;
-
 exports[`Generated Java Client Code Unit Tests Single 1`] = `
 Object {
   ".gitattributes": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
@@ -7611,7 +15387,7 @@ src/test/java/test/test/client/model/TestRequestTest.java
 src/test/java/test/test/client/model/TestResponseMessagesInnerTest.java
 src/test/java/test/test/client/model/TestResponseTest.java
 ",
-  ".openapi-generator/VERSION": "6.0.1",
+  ".openapi-generator/VERSION": "6.3.0",
   ".projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -8168,19 +15944,11 @@ components:
       - errorMessage
       type: object
     TestRequest:
-      example:
-        myInput: 0.8008281904610115
       properties:
         myInput:
           type: number
       type: object
     TestResponse:
-      example:
-        messages:
-        - id: 0
-          message: message
-        - id: 0
-          message: message
       properties:
         messages:
           items:
@@ -8190,9 +15958,6 @@ components:
       - messages
       type: object
     TestResponse_messages_inner:
-      example:
-        id: 0
-        message: message
       properties:
         message:
           type: string
@@ -8218,7 +15983,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -8270,7 +16035,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -8311,20 +16076,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -8384,19 +16149,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -9772,7 +17538,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -9815,6 +17581,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -9831,7 +17598,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -9845,7 +17612,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>add_sources</id>
@@ -9876,7 +17643,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -9899,7 +17666,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -9979,11 +17746,6 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>\${swagger-core-version}</version>
-        </dependency>
         <!-- @Nullable annotation -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -10026,6 +17788,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <artifactId>jackson-databind-nullable</artifactId>
             <version>\${jackson-databind-nullable-version}</version>
         </dependency>
+
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
@@ -10061,19 +17824,19 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <maven.compiler.source>\${java.version}</maven.compiler.source>
         <maven.compiler.target>\${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.5</gson-fire-version>
-        <swagger-core-version>1.6.5</swagger-core-version>
-        <okhttp-version>4.9.3</okhttp-version>
-        <gson-version>2.9.0</gson-version>
+        <swagger-annotations-version>1.6.6</swagger-annotations-version>
+        <okhttp-version>4.10.0</okhttp-version>
+        <gson-version>2.9.1</gson-version>
         <commons-lang3-version>3.12.0</commons-lang3-version>
-        <jackson-databind-nullable-version>0.2.3</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.8.2</junit-version>
-        <junit-platform-runner.version>1.6.2</junit-platform-runner.version>
+        <junit-version>5.9.1</junit-version>
+        <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
         <mockito-core-version>3.12.4</mockito-core-version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spotless.version>2.21.0</spotless.version>
+        <spotless.version>2.27.2</spotless.version>
     </properties>
 </project>
 ",
@@ -10215,6 +17978,15 @@ import test.test.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -10308,6 +18080,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -10432,7 +18231,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -10443,7 +18242,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -10454,7 +18253,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -10465,7 +18264,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -10476,7 +18275,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -10569,6 +18368,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -10737,7 +18548,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -10745,7 +18556,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -10996,7 +18807,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -11030,11 +18841,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -11325,7 +19138,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -11454,11 +19278,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -11492,6 +19317,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -11559,7 +19409,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -11592,7 +19442,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws test.test.client.ApiException If fail to serialize the request body object into a string
      */
@@ -11713,7 +19563,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -12634,7 +20484,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -12883,10 +20733,7 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call anyRequestResponseValidateBeforeCall(Object body, final ApiCallback _callback) throws ApiException {
-        
-
-        okhttp3.Call localVarCall = anyRequestResponseCall(body, _callback);
-        return localVarCall;
+        return anyRequestResponseCall(body, _callback);
 
     }
 
@@ -13020,7 +20867,6 @@ public class DefaultApi {
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
         final String[] localVarAccepts = {
-            
         };
         final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
         if (localVarAccept != null) {
@@ -13028,7 +20874,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -13041,10 +20886,7 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call emptyValidateBeforeCall(final ApiCallback _callback) throws ApiException {
-        
-
-        okhttp3.Call localVarCall = emptyCall(_callback);
-        return localVarCall;
+        return emptyCall(_callback);
 
     }
 
@@ -13184,15 +21026,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call mediaTypesValidateBeforeCall(File body, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'body' is set
         if (body == null) {
             throw new ApiException(\\"Missing the required parameter 'body' when calling mediaTypes(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = mediaTypesCall(body, _callback);
-        return localVarCall;
+        return mediaTypesCall(body, _callback);
 
     }
 
@@ -13310,7 +21149,7 @@ public class DefaultApi {
 
         // create path and map variables
         String localVarPath = \\"/path/{pathParam}\\"
-            .replaceAll(\\"\\\\\\\\{\\" + \\"pathParam\\" + \\"\\\\\\\\}\\", localVarApiClient.escapeString(pathParam.toString()));
+            .replace(\\"{\\" + \\"pathParam\\" + \\"}\\", localVarApiClient.escapeString(pathParam.toString()));
 
         List<Pair> localVarQueryParams = new ArrayList<Pair>();
         List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
@@ -13356,35 +21195,32 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call operationOneValidateBeforeCall(String param1, List<String> param2, BigDecimal param3, String pathParam, TestRequest testRequest, String param4, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'param1' is set
         if (param1 == null) {
             throw new ApiException(\\"Missing the required parameter 'param1' when calling operationOne(Async)\\");
         }
-        
+
         // verify the required parameter 'param2' is set
         if (param2 == null) {
             throw new ApiException(\\"Missing the required parameter 'param2' when calling operationOne(Async)\\");
         }
-        
+
         // verify the required parameter 'param3' is set
         if (param3 == null) {
             throw new ApiException(\\"Missing the required parameter 'param3' when calling operationOne(Async)\\");
         }
-        
+
         // verify the required parameter 'pathParam' is set
         if (pathParam == null) {
             throw new ApiException(\\"Missing the required parameter 'pathParam' when calling operationOne(Async)\\");
         }
-        
+
         // verify the required parameter 'testRequest' is set
         if (testRequest == null) {
             throw new ApiException(\\"Missing the required parameter 'testRequest' when calling operationOne(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = operationOneCall(param1, param2, param3, pathParam, testRequest, param4, _callback);
-        return localVarCall;
+        return operationOneCall(param1, param2, param3, pathParam, testRequest, param4, _callback);
 
     }
 
@@ -13546,7 +21382,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -13559,10 +21394,7 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call withoutOperationIdDeleteValidateBeforeCall(final ApiCallback _callback) throws ApiException {
-        
-
-        okhttp3.Call localVarCall = withoutOperationIdDeleteCall(_callback);
-        return localVarCall;
+        return withoutOperationIdDeleteCall(_callback);
 
     }
 
@@ -15679,8 +23511,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -15697,6 +23527,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -15713,7 +23544,7 @@ public class ApiError {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiError() { 
+  public ApiError() {
   }
 
   public ApiError errorMessage(String errorMessage) {
@@ -15727,7 +23558,6 @@ public class ApiError {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -15799,9 +23629,7 @@ public class ApiError {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiError.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiError.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiError is not found in the empty JSON string\\", ApiError.openapiRequiredFields.toString()));
         }
       }
@@ -15820,7 +23648,7 @@ public class ApiError {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -15898,8 +23726,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import java.math.BigDecimal;
 
@@ -15917,6 +23743,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -15933,7 +23760,7 @@ public class TestRequest {
   @SerializedName(SERIALIZED_NAME_MY_INPUT)
   private BigDecimal myInput;
 
-  public TestRequest() { 
+  public TestRequest() {
   }
 
   public TestRequest myInput(BigDecimal myInput) {
@@ -15947,7 +23774,6 @@ public class TestRequest {
    * @return myInput
   **/
   @javax.annotation.Nullable
-  @ApiModelProperty(value = \\"\\")
 
   public BigDecimal getMyInput() {
     return myInput;
@@ -16018,9 +23844,7 @@ public class TestRequest {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (TestRequest.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!TestRequest.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in TestRequest is not found in the empty JSON string\\", TestRequest.openapiRequiredFields.toString()));
         }
       }
@@ -16107,8 +23931,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -16128,6 +23950,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -16144,7 +23967,7 @@ public class TestResponse {
   @SerializedName(SERIALIZED_NAME_MESSAGES)
   private List<TestResponseMessagesInner> messages = new ArrayList<>();
 
-  public TestResponse() { 
+  public TestResponse() {
   }
 
   public TestResponse messages(List<TestResponseMessagesInner> messages) {
@@ -16163,7 +23986,6 @@ public class TestResponse {
    * @return messages
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public List<TestResponseMessagesInner> getMessages() {
     return messages;
@@ -16235,9 +24057,7 @@ public class TestResponse {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (TestResponse.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!TestResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in TestResponse is not found in the empty JSON string\\", TestResponse.openapiRequiredFields.toString()));
         }
       }
@@ -16256,18 +24076,16 @@ public class TestResponse {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      JsonArray jsonArraymessages = jsonObj.getAsJsonArray(\\"messages\\");
-      if (jsonArraymessages != null) {
-        // ensure the json data is an array
-        if (!jsonObj.get(\\"messages\\").isJsonArray()) {
-          throw new IllegalArgumentException(String.format(\\"Expected the field \`messages\` to be an array in the JSON string but got \`%s\`\\", jsonObj.get(\\"messages\\").toString()));
-        }
-
-        // validate the optional field \`messages\` (array)
-        for (int i = 0; i < jsonArraymessages.size(); i++) {
-          TestResponseMessagesInner.validateJsonObject(jsonArraymessages.get(i).getAsJsonObject());
-        };
+      // ensure the json data is an array
+      if (!jsonObj.get(\\"messages\\").isJsonArray()) {
+        throw new IllegalArgumentException(String.format(\\"Expected the field \`messages\` to be an array in the JSON string but got \`%s\`\\", jsonObj.get(\\"messages\\").toString()));
       }
+
+      JsonArray jsonArraymessages = jsonObj.getAsJsonArray(\\"messages\\");
+      // validate the required field \`messages\` (array)
+      for (int i = 0; i < jsonArraymessages.size(); i++) {
+        TestResponseMessagesInner.validateJsonObject(jsonArraymessages.get(i).getAsJsonObject());
+      };
   }
 
   public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
@@ -16343,8 +24161,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -16361,6 +24177,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -16381,7 +24198,7 @@ public class TestResponseMessagesInner {
   @SerializedName(SERIALIZED_NAME_ID)
   private Integer id;
 
-  public TestResponseMessagesInner() { 
+  public TestResponseMessagesInner() {
   }
 
   public TestResponseMessagesInner message(String message) {
@@ -16395,7 +24212,6 @@ public class TestResponseMessagesInner {
    * @return message
   **/
   @javax.annotation.Nullable
-  @ApiModelProperty(value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -16418,7 +24234,6 @@ public class TestResponseMessagesInner {
    * @return id
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public Integer getId() {
     return id;
@@ -16493,9 +24308,7 @@ public class TestResponseMessagesInner {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (TestResponseMessagesInner.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!TestResponseMessagesInner.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in TestResponseMessagesInner is not found in the empty JSON string\\", TestResponseMessagesInner.openapiRequiredFields.toString()));
         }
       }
@@ -16514,7 +24327,7 @@ public class TestResponseMessagesInner {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if ((jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonNull()) && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -16699,8 +24512,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -16750,8 +24561,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.Disabled;
@@ -16802,8 +24611,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -16861,8 +24668,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -17065,7 +24870,7 @@ src/test/java/test/test/client/api/DefaultApiTest.java
 src/test/java/test/test/client/api/Tag1ApiTest.java
 src/test/java/test/test/client/api/Tag2ApiTest.java
 ",
-  ".openapi-generator/VERSION": "6.0.1",
+  ".openapi-generator/VERSION": "6.3.0",
   ".projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -17544,7 +25349,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -17596,7 +25401,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -17637,20 +25442,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -17710,19 +25515,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -18973,7 +26779,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -19016,6 +26822,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -19032,7 +26839,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -19046,7 +26853,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>add_sources</id>
@@ -19077,7 +26884,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -19100,7 +26907,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -19180,11 +26987,6 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>\${swagger-core-version}</version>
-        </dependency>
         <!-- @Nullable annotation -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -19227,6 +27029,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
             <artifactId>jackson-databind-nullable</artifactId>
             <version>\${jackson-databind-nullable-version}</version>
         </dependency>
+
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
@@ -19262,19 +27065,19 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <maven.compiler.source>\${java.version}</maven.compiler.source>
         <maven.compiler.target>\${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.5</gson-fire-version>
-        <swagger-core-version>1.6.5</swagger-core-version>
-        <okhttp-version>4.9.3</okhttp-version>
-        <gson-version>2.9.0</gson-version>
+        <swagger-annotations-version>1.6.6</swagger-annotations-version>
+        <okhttp-version>4.10.0</okhttp-version>
+        <gson-version>2.9.1</gson-version>
         <commons-lang3-version>3.12.0</commons-lang3-version>
-        <jackson-databind-nullable-version>0.2.3</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.8.2</junit-version>
-        <junit-platform-runner.version>1.6.2</junit-platform-runner.version>
+        <junit-version>5.9.1</junit-version>
+        <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
         <mockito-core-version>3.12.4</mockito-core-version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spotless.version>2.21.0</spotless.version>
+        <spotless.version>2.27.2</spotless.version>
     </properties>
 </project>
 ",
@@ -19416,6 +27219,15 @@ import test.test.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -19509,6 +27321,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -19633,7 +27472,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -19644,7 +27483,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -19655,7 +27494,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -19666,7 +27505,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -19677,7 +27516,7 @@ public class ApiClient {
      * @return a {@link test.test.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -19770,6 +27609,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -19938,7 +27789,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -19946,7 +27797,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -20197,7 +28048,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -20231,11 +28082,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -20526,7 +28379,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -20655,11 +28519,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -20693,6 +28558,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -20760,7 +28650,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -20793,7 +28683,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws test.test.client.ApiException If fail to serialize the request body object into a string
      */
@@ -20914,7 +28804,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -21831,7 +29721,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -22054,7 +29944,6 @@ public class DefaultApi {
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
         final String[] localVarAccepts = {
-            
         };
         final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
         if (localVarAccept != null) {
@@ -22062,7 +29951,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -22075,10 +29963,7 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call neitherValidateBeforeCall(final ApiCallback _callback) throws ApiException {
-        
-
-        okhttp3.Call localVarCall = neitherCall(_callback);
-        return localVarCall;
+        return neitherCall(_callback);
 
     }
 
@@ -23540,7 +31425,6 @@ public class Tag1Api {
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
         final String[] localVarAccepts = {
-            
         };
         final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
         if (localVarAccept != null) {
@@ -23548,7 +31432,6 @@ public class Tag1Api {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -23561,10 +31444,7 @@ public class Tag1Api {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call tag1ValidateBeforeCall(final ApiCallback _callback) throws ApiException {
-        
-
-        okhttp3.Call localVarCall = tag1Call(_callback);
-        return localVarCall;
+        return tag1Call(_callback);
 
     }
 
@@ -23683,7 +31563,6 @@ public class Tag1Api {
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
         final String[] localVarAccepts = {
-            
         };
         final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
         if (localVarAccept != null) {
@@ -23691,7 +31570,6 @@ public class Tag1Api {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -23704,10 +31582,7 @@ public class Tag1Api {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call tag1AgainValidateBeforeCall(final ApiCallback _callback) throws ApiException {
-        
-
-        okhttp3.Call localVarCall = tag1AgainCall(_callback);
-        return localVarCall;
+        return tag1AgainCall(_callback);
 
     }
 
@@ -23902,7 +31777,6 @@ public class Tag2Api {
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
         final String[] localVarAccepts = {
-            
         };
         final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
         if (localVarAccept != null) {
@@ -23910,7 +31784,6 @@ public class Tag2Api {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -23923,10 +31796,7 @@ public class Tag2Api {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call tag2ValidateBeforeCall(final ApiCallback _callback) throws ApiException {
-        
-
-        okhttp3.Call localVarCall = tag2Call(_callback);
-        return localVarCall;
+        return tag2Call(_callback);
 
     }
 
diff --git a/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-python-client-source-code.test.ts.snap b/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-python-client-source-code.test.ts.snap
index 31f0e45e8..ca12322a2 100644
--- a/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-python-client-source-code.test.ts.snap
+++ b/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-python-client-source-code.test.ts.snap
@@ -197,7 +197,7 @@ test/test_models/test_test_request.py
 test/test_models/test_test_response.py
 tox.ini
 ",
-  ".openapi-generator/VERSION": "6.1.0",
+  ".openapi-generator/VERSION": "6.3.0",
   ".projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -373,13 +373,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -420,6 +418,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -500,7 +508,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test
 from pprint import pprint
-from test.apis import default_api
+from test.apis.tags import default_api
 from test.model.api_error import ApiError
 from test.model.test_request import TestRequest
 from test.model.test_response import TestResponse
@@ -633,10 +641,10 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 ### body
 
-#### SchemaForRequestBodyApplicationJson
+# SchemaForRequestBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**TestRequest**](TestRequest.md) |  | 
+[**TestRequest**](../../models/TestRequest.md) |  | 
 
 
 ### path_params
@@ -646,49 +654,47 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 pathParam | PathParamSchema | | 
 
-#### PathParamSchema
+# PathParamSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#some_test_operation.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#some_test_operation.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### some_test_operation.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**TestResponse**](TestResponse.md) |  | 
+[**TestResponse**](../../models/TestResponse.md) |  | 
 
 
-#### ApiResponseFor400
+#### some_test_operation.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiError**](ApiError.md) |  | 
-
+[**ApiError**](../../models/ApiError.md) |  | 
 
 
-[**TestResponse**](TestResponse.md)
-
 ### Authorization
 
 No authorization required
@@ -698,33 +704,74 @@ No authorization required
 ",
   "docs/models/ApiError.md": "# test.model.api_error.ApiError
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "docs/models/TestRequest.md": "# test.model.test_request.TestRequest
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**myInput** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**myInput** | decimal.Decimal, int, float,  | decimal.Decimal,  |  | [optional] 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "docs/models/TestResponse.md": "# test.model.test_response.TestResponse
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**[messages](#messages)** | list, tuple,  | tuple,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
+
+# messages
+
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+list, tuple,  | tuple,  |  | 
+
+### Tuple Items
+Class Name | Input Type | Accessed Type | Description | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+[items](#items) | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+# items
+
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**messages** | **[{str: (bool, date, datetime, dict, float, int, list, str, none_type)}]** |  | 
-**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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**id** | decimal.Decimal, int,  | decimal.Decimal,  |  | 
+**message** | str,  | str,  |  | [optional] 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -732,7 +779,7 @@ Name | Type | Description | Notes
   "git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -791,11 +838,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "setup.cfg": "[flake8]
 max-line-length=99
@@ -823,10 +871,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -837,7 +887,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -879,9 +929,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -911,6 +962,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -1153,7 +1206,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -1182,8 +1235,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -1210,7 +1280,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -1257,8 +1326,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -1353,7 +1425,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -1371,7 +1443,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -1434,8 +1506,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -1474,12 +1544,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -1538,7 +1613,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -1567,7 +1642,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -1579,7 +1654,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -1595,7 +1670,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -1634,14 +1709,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -1658,23 +1733,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -1695,6 +1753,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -1714,13 +1785,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -1762,8 +1836,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -1833,7 +1907,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -1890,15 +1964,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -1910,7 +1987,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -2103,7 +2180,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -2175,9 +2252,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -2221,24 +2298,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -2294,7 +2371,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -2328,17 +2405,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "test/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "test/apis/path_to_api.py": "import typing
+  "test/apis/path_to_api.py": "import typing_extensions
 
 from test.paths import PathValues
 from test.apis.paths.operation_path_param import OperationPathParam
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.OPERATION_PATH_PARAM: OperationPathParam,
@@ -2363,12 +2439,12 @@ class OperationPathParam(
 ):
     pass
 ",
-  "test/apis/tag_to_api.py": "import typing
+  "test/apis/tag_to_api.py": "import typing_extensions
 
 from test.apis.tags import TagValues
 from test.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -2718,14 +2794,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -2743,26 +2821,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -3096,6 +3154,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -3185,19 +3247,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -3246,6 +3315,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3267,6 +3337,7 @@ class ApiError(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -3276,36 +3347,36 @@ class ApiError(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiError':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -3328,6 +3399,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3349,6 +3421,7 @@ class ApiError(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -3358,36 +3431,36 @@ class ApiError(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiError':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -3410,6 +3483,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3428,6 +3502,7 @@ class TestRequest(
 
 
     class MetaOapg:
+        
         class properties:
             myInput = schemas.NumberSchema
             __annotations__ = {
@@ -3435,36 +3510,36 @@ class TestRequest(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"myInput\\"]) -> MetaOapg.properties.myInput: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"myInput\\"]) -> MetaOapg.properties.myInput: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"myInput\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"myInput\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"myInput\\"]) -> typing.Union[MetaOapg.properties.myInput, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"myInput\\"]) -> typing.Union[MetaOapg.properties.myInput, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"myInput\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"myInput\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         myInput: typing.Union[MetaOapg.properties.myInput, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TestRequest':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             myInput=myInput,
             _configuration=_configuration,
             **kwargs,
@@ -3487,6 +3562,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3505,6 +3581,7 @@ class TestRequest(
 
 
     class MetaOapg:
+        
         class properties:
             myInput = schemas.NumberSchema
             __annotations__ = {
@@ -3512,36 +3589,36 @@ class TestRequest(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"myInput\\"]) -> MetaOapg.properties.myInput: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"myInput\\"]) -> MetaOapg.properties.myInput: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"myInput\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"myInput\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"myInput\\"]) -> typing.Union[MetaOapg.properties.myInput, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"myInput\\"]) -> typing.Union[MetaOapg.properties.myInput, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"myInput\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"myInput\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         myInput: typing.Union[MetaOapg.properties.myInput, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TestRequest':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             myInput=myInput,
             _configuration=_configuration,
             **kwargs,
@@ -3564,6 +3641,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3585,6 +3663,7 @@ class TestResponse(
         required = {
             \\"messages\\",
         }
+        
         class properties:
             
             
@@ -3605,6 +3684,7 @@ class TestResponse(
                             required = {
                                 \\"id\\",
                             }
+                            
                             class properties:
                                 message = schemas.StrSchema
                                 id = schemas.IntSchema
@@ -3616,43 +3696,43 @@ class TestResponse(
                         id: MetaOapg.properties.id
                         
                         @typing.overload
-                        def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+                        def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
                         
                         @typing.overload
-                        def __getitem__(self, name: typing.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
+                        def __getitem__(self, name: typing_extensions.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
                         
                         @typing.overload
                         def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
                         
-                        def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", \\"id\\", ], str]):
+                        def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", \\"id\\", ], str]):
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
                         
                         
                         @typing.overload
-                        def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
+                        def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
                         
                         @typing.overload
-                        def get_item_oapg(self, name: typing.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
+                        def get_item_oapg(self, name: typing_extensions.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
                         
                         @typing.overload
                         def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                         
-                        def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", \\"id\\", ], str]):
+                        def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", \\"id\\", ], str]):
                             return super().get_item_oapg(name)
                         
                     
                         def __new__(
                             cls,
-                            *args: typing.Union[dict, frozendict.frozendict, ],
-                            id: typing.Union[MetaOapg.properties.id, int, ],
+                            *_args: typing.Union[dict, frozendict.frozendict, ],
+                            id: typing.Union[MetaOapg.properties.id, decimal.Decimal, int, ],
                             message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
                             _configuration: typing.Optional[schemas.Configuration] = None,
                             **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,
-                                *args,
+                                *_args,
                                 id=id,
                                 message=message,
                                 _configuration=_configuration,
@@ -3661,12 +3741,12 @@ class TestResponse(
             
                 def __new__(
                     cls,
-                    arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]]],
+                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]]],
                     _configuration: typing.Optional[schemas.Configuration] = None,
                 ) -> 'messages':
                     return super().__new__(
                         cls,
-                        arg,
+                        _arg,
                         _configuration=_configuration,
                     )
             
@@ -3679,36 +3759,36 @@ class TestResponse(
     messages: MetaOapg.properties.messages
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"messages\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"messages\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"messages\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"messages\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        messages: typing.Union[MetaOapg.properties.messages, tuple, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
+        messages: typing.Union[MetaOapg.properties.messages, list, tuple, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TestResponse':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             messages=messages,
             _configuration=_configuration,
             **kwargs,
@@ -3731,6 +3811,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3752,6 +3833,7 @@ class TestResponse(
         required = {
             \\"messages\\",
         }
+        
         class properties:
             
             
@@ -3772,6 +3854,7 @@ class TestResponse(
                             required = {
                                 \\"id\\",
                             }
+                            
                             class properties:
                                 message = schemas.StrSchema
                                 id = schemas.IntSchema
@@ -3783,43 +3866,43 @@ class TestResponse(
                         id: MetaOapg.properties.id
                         
                         @typing.overload
-                        def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+                        def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
                         
                         @typing.overload
-                        def __getitem__(self, name: typing.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
+                        def __getitem__(self, name: typing_extensions.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
                         
                         @typing.overload
                         def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
                         
-                        def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", \\"id\\", ], str]):
+                        def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", \\"id\\", ], str]):
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
                         
                         
                         @typing.overload
-                        def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
+                        def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
                         
                         @typing.overload
-                        def get_item_oapg(self, name: typing.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
+                        def get_item_oapg(self, name: typing_extensions.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
                         
                         @typing.overload
                         def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                         
-                        def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", \\"id\\", ], str]):
+                        def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", \\"id\\", ], str]):
                             return super().get_item_oapg(name)
                         
                     
                         def __new__(
                             cls,
-                            *args: typing.Union[dict, frozendict.frozendict, ],
-                            id: typing.Union[MetaOapg.properties.id, int, ],
+                            *_args: typing.Union[dict, frozendict.frozendict, ],
+                            id: typing.Union[MetaOapg.properties.id, decimal.Decimal, int, ],
                             message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
                             _configuration: typing.Optional[schemas.Configuration] = None,
                             **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,
-                                *args,
+                                *_args,
                                 id=id,
                                 message=message,
                                 _configuration=_configuration,
@@ -3828,12 +3911,12 @@ class TestResponse(
             
                 def __new__(
                     cls,
-                    arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]]],
+                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]]],
                     _configuration: typing.Optional[schemas.Configuration] = None,
                 ) -> 'messages':
                     return super().__new__(
                         cls,
-                        arg,
+                        _arg,
                         _configuration=_configuration,
                     )
             
@@ -3846,36 +3929,36 @@ class TestResponse(
     messages: MetaOapg.properties.messages
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"messages\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"messages\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"messages\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"messages\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        messages: typing.Union[MetaOapg.properties.messages, tuple, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
+        messages: typing.Union[MetaOapg.properties.messages, list, tuple, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TestResponse':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             messages=messages,
             _configuration=_configuration,
             **kwargs,
@@ -3889,7 +3972,7 @@ class TestResponse(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test.model.pet import Pet
+# from test.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -3924,6 +4007,7 @@ path = PathValues.OPERATION_PATH_PARAM",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -3934,6 +4018,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3946,15 +4031,15 @@ from test.model.test_request import TestRequest
 
 from . import path
 
-# path params
+# Path params
 PathParamSchema = schemas.StrSchema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'pathParam': typing.Union[PathParamSchema, str, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
@@ -4031,20 +4116,72 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _some_test_operation_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _some_test_operation_oapg(
-        self: api_client.Api,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def _some_test_operation_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _some_test_operation_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _some_test_operation_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -4103,7 +4240,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -4111,19 +4252,72 @@ class BaseApi(api_client.Api):
 class SomeTestOperation(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def some_test_operation(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def some_test_operation(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def some_test_operation(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def some_test_operation(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def some_test_operation(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._some_test_operation_oapg(
             body=body,
             path_params=path_params,
@@ -4138,19 +4332,72 @@ class SomeTestOperation(BaseApi):
 class ApiForpost(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def post(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._some_test_operation_oapg(
             body=body,
             path_params=path_params,
@@ -4172,6 +4419,7 @@ class ApiForpost(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -4182,6 +4430,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -4192,38 +4441,159 @@ from test.model.test_response import TestResponse
 from test.model.api_error import ApiError
 from test.model.test_request import TestRequest
 
-# path params
+# Path params
 PathParamSchema = schemas.StrSchema
-# body param
-SchemaForRequestBodyApplicationJson = TestRequest
-SchemaFor200ResponseBodyApplicationJson = TestResponse
-SchemaFor400ResponseBodyApplicationJson = ApiError
-_all_accept_content_types = (
-    'application/json',
+RequestRequiredPathParams = typing_extensions.TypedDict(
+    'RequestRequiredPathParams',
+    {
+        'pathParam': typing.Union[PathParamSchema, str, ],
+    }
+)
+RequestOptionalPathParams = typing_extensions.TypedDict(
+    'RequestOptionalPathParams',
+    {
+    },
+    total=False
 )
 
 
-class BaseApi(api_client.Api):
+class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
+    pass
 
-    def _some_test_operation_oapg(
-        self: api_client.Api,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
+
+request_path_path_param = api_client.PathParameter(
+    name=\\"pathParam\\",
+    style=api_client.ParameterStyle.SIMPLE,
+    schema=PathParamSchema,
+    required=True,
+)
+# body param
+SchemaForRequestBodyApplicationJson = TestRequest
+
+
+request_body_test_request = api_client.RequestBody(
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaForRequestBodyApplicationJson),
+    },
+    required=True,
+)
+SchemaFor200ResponseBodyApplicationJson = TestResponse
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiError
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _some_test_operation_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _some_test_operation_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def _some_test_operation_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _some_test_operation_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _some_test_operation_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
         used_path = path.value
 
         _path_params = {}
@@ -4276,7 +4646,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -4284,19 +4658,72 @@ class BaseApi(api_client.Api):
 class SomeTestOperation(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def some_test_operation(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def some_test_operation(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def some_test_operation(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def some_test_operation(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def some_test_operation(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._some_test_operation_oapg(
             body=body,
             path_params=path_params,
@@ -4311,19 +4738,72 @@ class SomeTestOperation(BaseApi):
 class ApiForpost(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def post(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._some_test_operation_oapg(
             body=body,
             path_params=path_params,
@@ -4484,6 +4964,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -4607,6 +5088,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -4641,17 +5123,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -4739,14 +5221,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -4754,15 +5249,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -4775,9 +5270,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -4786,17 +5289,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -4835,8 +5336,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -4845,21 +5408,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -4869,6 +5419,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -4913,16 +5471,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -4939,7 +5497,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -5027,12 +5585,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -5041,14 +5599,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -5065,7 +5623,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -5083,17 +5641,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -5126,42 +5700,246 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
-    # qty 6
-    class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
         pass
-else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
-
-
-class ValidatorBase:
-    @staticmethod
-    def _is_json_validation_enabled_oapg(schema_keyword, configuration=None):
-        \\"\\"\\"Returns true if JSON schema validation is enabled for the specified
-        validation keyword. This can be used to skip JSON schema structural validation
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
+else:
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
+
+
+class ValidatorBase:
+    @staticmethod
+    def _is_json_validation_enabled_oapg(schema_keyword, configuration=None):
+        \\"\\"\\"Returns true if JSON schema validation is enabled for the specified
+        validation keyword. This can be used to skip JSON schema structural validation
         as requested in the configuration.
         Note: the suffix _oapg stands for openapi python (experimental) generator and
         it has been added to prevent collisions with other methods and properties
@@ -5176,7 +5954,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -5188,147 +5966,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -5396,7 +6049,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -5406,7 +6059,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -5421,14 +6074,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -5450,9 +6103,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -5516,9 +6169,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -5549,7 +6202,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -5578,7 +6231,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -5586,7 +6239,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -5644,7 +6297,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -5661,7 +6314,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -5682,7 +6335,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -5692,7 +6345,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -5702,7 +6355,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -5712,7 +6365,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -5755,6 +6408,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -5764,6 +6418,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -5779,7 +6434,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -5789,7 +6444,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -5800,7 +6455,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -5888,7 +6543,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -5903,21 +6558,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -6016,9 +6674,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -6026,6 +6682,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -6042,7 +6699,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -6052,7 +6709,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -6089,7 +6746,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -6114,6 +6771,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -6212,18 +6870,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -6274,8 +6925,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -6290,12 +6942,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -6314,6 +6967,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -6325,9 +6979,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -6378,7 +7033,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -6415,8 +7072,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -6438,13 +7096,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -6465,7 +7123,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -6475,12 +7132,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -6490,12 +7146,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -6506,14 +7161,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -6552,15 +7207,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -6571,10 +7244,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -6585,10 +7276,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -6597,17 +7306,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
 
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -6615,13 +7340,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -6634,34 +7358,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -6670,23 +7394,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -6705,8 +7429,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -6714,24 +7438,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -6741,14 +7465,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -6756,7 +7477,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -6781,18 +7502,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -6801,14 +7521,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -6825,8 +7545,7 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "test/test_models/__init__.py": "",
   "test/test_models/test_api_error.py": "# coding: utf-8
 
@@ -6949,7 +7668,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -6958,7 +7677,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -7037,9 +7756,10 @@ def test_hello(name, expected):
     assert hello(name) == expected
 ",
   "tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -7049,9 +7769,7 @@ commands=
 }
 `;
 
-exports[`Generated Python Client Code Unit Tests Multiple Tags 1`] = `"Operations with multiple tags are not yet supported, please tag operations with at most one tag. The following operations have multiple tags: get /both"`;
-
-exports[`Generated Python Client Code Unit Tests Single 1`] = `
+exports[`Generated Python Client Code Unit Tests Multiple Tags 1`] = `
 Object {
   ".gitattributes": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 
@@ -7216,9 +7934,8 @@ test-3.8:
 .travis.yml
 README.md
 docs/apis/tags/DefaultApi.md
-docs/models/ApiError.md
-docs/models/TestRequest.md
-docs/models/TestResponse.md
+docs/apis/tags/Tag1Api.md
+docs/apis/tags/Tag2Api.md
 git_push.sh
 requirements.txt
 setup.cfg
@@ -7230,25 +7947,18 @@ test/api_client.py
 test/apis/__init__.py
 test/apis/tags/default_api.py
 test/apis/tags/default_api_operation_config.py
+test/apis/tags/tag1_api.py
+test/apis/tags/tag2_api.py
 test/configuration.py
 test/exceptions.py
 test/model/__init__.py
-test/model/api_error.py
-test/model/api_error.pyi
-test/model/test_request.py
-test/model/test_request.pyi
-test/model/test_response.py
-test/model/test_response.pyi
 test/models/__init__.py
 test/rest.py
 test/schemas.py
 test/test_models/__init__.py
-test/test_models/test_api_error.py
-test/test_models/test_test_request.py
-test/test_models/test_test_response.py
 tox.ini
 ",
-  ".openapi-generator/VERSION": "6.1.0",
+  ".openapi-generator/VERSION": "6.3.0",
   ".projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -7424,13 +8134,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -7471,6 +8179,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -7551,10 +8269,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test
 from pprint import pprint
-from test.apis import default_api
-from test.model.api_error import ApiError
-from test.model.test_request import TestRequest
-from test.model.test_response import TestResponse
+from test.apis.tags import default_api
 # Defining the host is optional and defaults to http://localhost
 # See configuration.py for a list of all supported configuration parameters.
 configuration = test.Configuration(
@@ -7566,13 +8281,11 @@ configuration = test.Configuration(
 with test.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = default_api.DefaultApi(api_client)
-    body = None # bool, date, datetime, dict, float, int, list, str, none_type |  (optional)
-
+    
     try:
-        api_response = api_instance.any_request_response(body=body)
-        pprint(api_response)
+        api_instance.neither()
     except test.ApiException as e:
-        print(\\"Exception when calling DefaultApi->any_request_response: %s\\\\n\\" % e)
+        print(\\"Exception when calling DefaultApi->neither: %s\\\\n\\" % e)
 \`\`\`
 
 ## Documentation for API Endpoints
@@ -7581,17 +8294,13 @@ All URIs are relative to *http://localhost*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*DefaultApi* | [**any_request_response**](docs/apis/tags/DefaultApi.md#any_request_response) | **put** /any-request-response | 
-*DefaultApi* | [**empty**](docs/apis/tags/DefaultApi.md#empty) | **put** /empty-response | 
-*DefaultApi* | [**media_types**](docs/apis/tags/DefaultApi.md#media_types) | **post** /different-media-type | 
-*DefaultApi* | [**operation_one**](docs/apis/tags/DefaultApi.md#operation_one) | **post** /path/{pathParam} | 
-*DefaultApi* | [**without_operation_id_delete**](docs/apis/tags/DefaultApi.md#without_operation_id_delete) | **delete** /without-operation-id | 
+*DefaultApi* | [**neither**](docs/apis/tags/DefaultApi.md#neither) | **get** /neither | 
+*Tag1Api* | [**both**](docs/apis/tags/Tag1Api.md#both) | **get** /both | 
+*Tag1Api* | [**tag1**](docs/apis/tags/Tag1Api.md#tag1) | **get** /tag1 | 
+*Tag2Api* | [**tag2**](docs/apis/tags/Tag2Api.md#tag2) | **get** /tag2 | 
 
 ## Documentation For Models
 
- - [ApiError](docs/models/ApiError.md)
- - [TestRequest](docs/models/TestRequest.md)
- - [TestResponse](docs/models/TestResponse.md)
 
 ## Documentation For Authorization
 
@@ -7601,6 +8310,8 @@ Class | Method | HTTP request | Description
 
 
 
+
+
 ## Notes for Large OpenAPI documents
 If the OpenAPI document is large, imports in test.apis and test.models may fail with a
 RecursionError indicating the maximum recursion limit has been exceeded. In that case, there are a couple of solutions:
@@ -7627,15 +8338,11 @@ All URIs are relative to *http://localhost*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**any_request_response**](#any_request_response) | **put** /any-request-response | 
-[**empty**](#empty) | **put** /empty-response | 
-[**media_types**](#media_types) | **post** /different-media-type | 
-[**operation_one**](#operation_one) | **post** /path/{pathParam} | 
-[**without_operation_id_delete**](#without_operation_id_delete) | **delete** /without-operation-id | 
+[**neither**](#neither) | **get** /neither | 
 
-# **any_request_response**
-<a name=\\"any_request_response\\"></a>
-> bool, date, datetime, dict, float, int, list, str, none_type any_request_response()
+# **neither**
+<a name=\\"neither\\"></a>
+> neither()
 
 
 
@@ -7656,57 +8363,8393 @@ with test.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = default_api.DefaultApi(api_client)
 
-    # example passing only optional values
-    body = None
+    # example, this endpoint has no required or optional parameters
     try:
-        api_response = api_instance.any_request_response(
-            body=body,
-        )
-        pprint(api_response)
+        api_response = api_instance.neither()
     except test.ApiException as e:
-        print(\\"Exception when calling DefaultApi->any_request_response: %s\\\\n\\" % e)
+        print(\\"Exception when calling DefaultApi->neither: %s\\\\n\\" % e)
 \`\`\`
 ### Parameters
+This endpoint does not need any parameter.
+
+### Return Types, Responses
 
+Code | Class | Description
+------------- | ------------- | -------------
+n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
+200 | [ApiResponseFor200](#neither.ApiResponseFor200) | Ok
+
+#### neither.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
-body | typing.Union[SchemaForRequestBodyApplicationJson, Unset] | optional, default is unset |
-content_type | str | optional, default is 'application/json' | Selects the schema and serialization of the request body
-accept_content_types | typing.Tuple[str] | default is ('application/json', ) | Tells the server the content type(s) that are accepted by the client
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
+response | urllib3.HTTPResponse | Raw response |
+body | Unset | body was not defined |
+headers | Unset | headers were not defined |
+
+### Authorization
+
+No authorization required
+
+[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
+
+",
+  "docs/apis/tags/Tag1Api.md": "<a name=\\"__pageTop\\"></a>
+# test.apis.tags.tag1_api.Tag1Api
+
+All URIs are relative to *http://localhost*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**both**](#both) | **get** /both | 
+[**tag1**](#tag1) | **get** /tag1 | 
+
+# **both**
+<a name=\\"both\\"></a>
+> both()
+
+
+
+### Example
+
+\`\`\`python
+import test
+from test.apis.tags import tag1_api
+from pprint import pprint
+# Defining the host is optional and defaults to http://localhost
+# See configuration.py for a list of all supported configuration parameters.
+configuration = test.Configuration(
+    host = \\"http://localhost\\"
+)
+
+# Enter a context with an instance of the API client
+with test.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = tag1_api.Tag1Api(api_client)
+
+    # example, this endpoint has no required or optional parameters
+    try:
+        api_response = api_instance.both()
+    except test.ApiException as e:
+        print(\\"Exception when calling Tag1Api->both: %s\\\\n\\" % e)
+\`\`\`
+### Parameters
+This endpoint does not need any parameter.
+
+### Return Types, Responses
+
+Code | Class | Description
+------------- | ------------- | -------------
+n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
+200 | [ApiResponseFor200](#both.ApiResponseFor200) | Ok
+
+#### both.ApiResponseFor200
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+response | urllib3.HTTPResponse | Raw response |
+body | Unset | body was not defined |
+headers | Unset | headers were not defined |
+
+### Authorization
+
+No authorization required
+
+[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
+
+# **tag1**
+<a name=\\"tag1\\"></a>
+> tag1()
+
+
+
+### Example
+
+\`\`\`python
+import test
+from test.apis.tags import tag1_api
+from pprint import pprint
+# Defining the host is optional and defaults to http://localhost
+# See configuration.py for a list of all supported configuration parameters.
+configuration = test.Configuration(
+    host = \\"http://localhost\\"
+)
+
+# Enter a context with an instance of the API client
+with test.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = tag1_api.Tag1Api(api_client)
+
+    # example, this endpoint has no required or optional parameters
+    try:
+        api_response = api_instance.tag1()
+    except test.ApiException as e:
+        print(\\"Exception when calling Tag1Api->tag1: %s\\\\n\\" % e)
+\`\`\`
+### Parameters
+This endpoint does not need any parameter.
+
+### Return Types, Responses
+
+Code | Class | Description
+------------- | ------------- | -------------
+n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
+200 | [ApiResponseFor200](#tag1.ApiResponseFor200) | Ok
+
+#### tag1.ApiResponseFor200
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+response | urllib3.HTTPResponse | Raw response |
+body | Unset | body was not defined |
+headers | Unset | headers were not defined |
+
+### Authorization
+
+No authorization required
+
+[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
+
+",
+  "docs/apis/tags/Tag2Api.md": "<a name=\\"__pageTop\\"></a>
+# test.apis.tags.tag2_api.Tag2Api
+
+All URIs are relative to *http://localhost*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**tag2**](#tag2) | **get** /tag2 | 
+
+# **tag2**
+<a name=\\"tag2\\"></a>
+> tag2()
+
+
+
+### Example
+
+\`\`\`python
+import test
+from test.apis.tags import tag2_api
+from pprint import pprint
+# Defining the host is optional and defaults to http://localhost
+# See configuration.py for a list of all supported configuration parameters.
+configuration = test.Configuration(
+    host = \\"http://localhost\\"
+)
+
+# Enter a context with an instance of the API client
+with test.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = tag2_api.Tag2Api(api_client)
+
+    # example, this endpoint has no required or optional parameters
+    try:
+        api_response = api_instance.tag2()
+    except test.ApiException as e:
+        print(\\"Exception when calling Tag2Api->tag2: %s\\\\n\\" % e)
+\`\`\`
+### Parameters
+This endpoint does not need any parameter.
+
+### Return Types, Responses
+
+Code | Class | Description
+------------- | ------------- | -------------
+n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
+200 | [ApiResponseFor200](#tag2.ApiResponseFor200) | Ok
+
+#### tag2.ApiResponseFor200
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+response | urllib3.HTTPResponse | Raw response |
+body | Unset | body was not defined |
+headers | Unset | headers were not defined |
+
+### Authorization
+
+No authorization required
+
+[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
+
+",
+  "git_push.sh": "#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ \\"$git_host\\" = \\"\\" ]; then
+    git_host=\\"github.com\\"
+    echo \\"[INFO] No command line input provided. Set \\\\$git_host to $git_host\\"
+fi
+
+if [ \\"$git_user_id\\" = \\"\\" ]; then
+    git_user_id=\\"GIT_USER_ID\\"
+    echo \\"[INFO] No command line input provided. Set \\\\$git_user_id to $git_user_id\\"
+fi
+
+if [ \\"$git_repo_id\\" = \\"\\" ]; then
+    git_repo_id=\\"GIT_REPO_ID\\"
+    echo \\"[INFO] No command line input provided. Set \\\\$git_repo_id to $git_repo_id\\"
+fi
+
+if [ \\"$release_note\\" = \\"\\" ]; then
+    release_note=\\"Minor update\\"
+    echo \\"[INFO] No command line input provided. Set \\\\$release_note to $release_note\\"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m \\"$release_note\\"
+
+# Sets the new remote
+git_remote=\`git remote\`
+if [ \\"$git_remote\\" = \\"\\" ]; then # git remote not defined
+
+    if [ \\"$GIT_TOKEN\\" = \\"\\" ]; then
+        echo \\"[INFO] \\\\$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment.\\"
+        git remote add origin https://\${git_host}/\${git_user_id}/\${git_repo_id}.git
+    else
+        git remote add origin https://\${git_user_id}:\${GIT_TOKEN}@\${git_host}/\${git_user_id}/\${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo \\"Git pushing to https://\${git_host}/\${git_user_id}/\${git_repo_id}.git\\"
+git push origin master 2>&1 | grep -v 'To https'
+
+",
+  "requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+projen==99.99.99
+",
+  "requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
+setuptools >= 21.0.0
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
+",
+  "setup.cfg": "[flake8]
+max-line-length=99
+",
+  "setup.py": "# coding: utf-8
+
+\\"\\"\\"
+    Multiple Tags Test
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from setuptools import setup, find_packages  # noqa: H301
+
+NAME = \\"test\\"
+VERSION = \\"1.0.0\\"
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description=\\"Multiple Tags Test\\",
+    author=\\"OpenAPI Generator community\\",
+    author_email=\\"team@openapitools.org\\",
+    url=\\"\\",
+    keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Multiple Tags Test\\"],
+    python_requires=\\">=3.7\\",
+    install_requires=REQUIRES,
+    packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
+    include_package_data=True,
+    long_description=\\"\\"\\"\\\\
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+    \\"\\"\\"
+)
+",
+  "test-requirements.txt": "pytest~=4.6.7 # needed for python 3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 3.4
+",
+  "test/__init__.py": "",
+  "test/__main__.py": "from .example import hello
+
+if __name__ == \\"__main__\\":
+    name = input(\\"What is your name? \\")
+    print(hello(name))
+",
+  "test/api_client.py": "# coding: utf-8
+\\"\\"\\"
+    Multiple Tags Test
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+from decimal import Decimal
+import enum
+import email
+import json
+import os
+import io
+import atexit
+from multiprocessing.pool import ThreadPool
+import re
+import tempfile
+import typing
+import typing_extensions
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+from urllib.parse import urlparse, quote
+from urllib3.fields import RequestField as RequestFieldBase
+
+import frozendict
+
+from test import rest
+from test.configuration import Configuration
+from test.exceptions import ApiTypeError, ApiValueError
+from test.schemas import (
+    NoneClass,
+    BoolClass,
+    Schema,
+    FileIO,
+    BinarySchema,
+    date,
+    datetime,
+    none_type,
+    Unset,
+    unset,
+)
+
+
+class RequestField(RequestFieldBase):
+    def __eq__(self, other):
+        if not isinstance(other, RequestField):
+            return False
+        return self.__dict__ == other.__dict__
+
+
+class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
+    def default(self, obj):
+        if isinstance(obj, str):
+            return str(obj)
+        elif isinstance(obj, float):
+            return float(obj)
+        elif isinstance(obj, int):
+            return int(obj)
+        elif isinstance(obj, Decimal):
+            if obj.as_tuple().exponent >= 0:
+                return int(obj)
+            return float(obj)
+        elif isinstance(obj, NoneClass):
+            return None
+        elif isinstance(obj, BoolClass):
+            return bool(obj)
+        elif isinstance(obj, (dict, frozendict.frozendict)):
+            return {key: self.default(val) for key, val in obj.items()}
+        elif isinstance(obj, (list, tuple)):
+            return [self.default(item) for item in obj]
+        raise ApiValueError('Unable to prepare type {} for serialization'.format(obj.__class__.__name__))
+
+
+class ParameterInType(enum.Enum):
+    QUERY = 'query'
+    HEADER = 'header'
+    PATH = 'path'
+    COOKIE = 'cookie'
+
+
+class ParameterStyle(enum.Enum):
+    MATRIX = 'matrix'
+    LABEL = 'label'
+    FORM = 'form'
+    SIMPLE = 'simple'
+    SPACE_DELIMITED = 'spaceDelimited'
+    PIPE_DELIMITED = 'pipeDelimited'
+    DEEP_OBJECT = 'deepObject'
+
+
+class PrefixSeparatorIterator:
+    # A class to store prefixes and separators for rfc6570 expansions
+
+    def __init__(self, prefix: str, separator: str):
+        self.prefix = prefix
+        self.separator = separator
+        self.first = True
+        if separator in {'.', '|', '%20'}:
+            item_separator = separator
+        else:
+            item_separator = ','
+        self.item_separator = item_separator
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        if self.first:
+            self.first = False
+            return self.prefix
+        return self.separator
+
+
+class ParameterSerializerBase:
+    @classmethod
+    def _get_default_explode(cls, style: ParameterStyle) -> bool:
+        return False
+
+    @staticmethod
+    def __ref6570_item_value(in_data: typing.Any, percent_encode: bool):
+        \\"\\"\\"
+        Get representation if str/float/int/None/items in list/ values in dict
+        None is returned if an item is undefined, use cases are value=
+        - None
+        - []
+        - {}
+        - [None, None None]
+        - {'a': None, 'b': None}
+        \\"\\"\\"
+        if type(in_data) in {str, float, int}:
+            if percent_encode:
+                return quote(str(in_data))
+            return str(in_data)
+        elif isinstance(in_data, none_type):
+            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
+            return None
+        elif isinstance(in_data, list) and not in_data:
+            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
+            return None
+        elif isinstance(in_data, dict) and not in_data:
+            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
+            return None
+        raise ApiValueError('Unable to generate a ref6570 item representation of {}'.format(in_data))
+
+    @staticmethod
+    def _to_dict(name: str, value: str):
+        return {name: value}
+
+    @classmethod
+    def __ref6570_str_float_int_expansion(
+        cls,
+        variable_name: str,
+        in_data: typing.Any,
+        explode: bool,
+        percent_encode: bool,
+        prefix_separator_iterator: PrefixSeparatorIterator,
+        var_name_piece: str,
+        named_parameter_expansion: bool
+    ) -> str:
+        item_value = cls.__ref6570_item_value(in_data, percent_encode)
+        if item_value is None or (item_value == '' and prefix_separator_iterator.separator == ';'):
+            return next(prefix_separator_iterator) + var_name_piece
+        value_pair_equals = '=' if named_parameter_expansion else ''
+        return next(prefix_separator_iterator) + var_name_piece + value_pair_equals + item_value
+
+    @classmethod
+    def __ref6570_list_expansion(
+        cls,
+        variable_name: str,
+        in_data: typing.Any,
+        explode: bool,
+        percent_encode: bool,
+        prefix_separator_iterator: PrefixSeparatorIterator,
+        var_name_piece: str,
+        named_parameter_expansion: bool
+    ) -> str:
+        item_values = [cls.__ref6570_item_value(v, percent_encode) for v in in_data]
+        item_values = [v for v in item_values if v is not None]
+        if not item_values:
+            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
+            return \\"\\"
+        value_pair_equals = '=' if named_parameter_expansion else ''
+        if not explode:
+            return (
+                next(prefix_separator_iterator) +
+                var_name_piece +
+                value_pair_equals +
+                prefix_separator_iterator.item_separator.join(item_values)
+            )
+        # exploded
+        return next(prefix_separator_iterator) + next(prefix_separator_iterator).join(
+            [var_name_piece + value_pair_equals + val for val in item_values]
+        )
+
+    @classmethod
+    def __ref6570_dict_expansion(
+        cls,
+        variable_name: str,
+        in_data: typing.Any,
+        explode: bool,
+        percent_encode: bool,
+        prefix_separator_iterator: PrefixSeparatorIterator,
+        var_name_piece: str,
+        named_parameter_expansion: bool
+    ) -> str:
+        in_data_transformed = {key: cls.__ref6570_item_value(val, percent_encode) for key, val in in_data.items()}
+        in_data_transformed = {key: val for key, val in in_data_transformed.items() if val is not None}
+        if not in_data_transformed:
+            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
+            return \\"\\"
+        value_pair_equals = '=' if named_parameter_expansion else ''
+        if not explode:
+            return (
+                next(prefix_separator_iterator) +
+                var_name_piece + value_pair_equals +
+                prefix_separator_iterator.item_separator.join(
+                    prefix_separator_iterator.item_separator.join(
+                        item_pair
+                    ) for item_pair in in_data_transformed.items()
+                )
+            )
+        # exploded
+        return next(prefix_separator_iterator) + next(prefix_separator_iterator).join(
+            [key + '=' + val for key, val in in_data_transformed.items()]
+        )
+
+    @classmethod
+    def _ref6570_expansion(
+        cls,
+        variable_name: str,
+        in_data: typing.Any,
+        explode: bool,
+        percent_encode: bool,
+        prefix_separator_iterator: PrefixSeparatorIterator
+    ) -> str:
+        \\"\\"\\"
+        Separator is for separate variables like dict with explode true, not for array item separation
+        \\"\\"\\"
+        named_parameter_expansion = prefix_separator_iterator.separator in {'&', ';'}
+        var_name_piece = variable_name if named_parameter_expansion else ''
+        if type(in_data) in {str, float, int}:
+            return cls.__ref6570_str_float_int_expansion(
+                variable_name,
+                in_data,
+                explode,
+                percent_encode,
+                prefix_separator_iterator,
+                var_name_piece,
+                named_parameter_expansion
+            )
+        elif isinstance(in_data, none_type):
+            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
+            return \\"\\"
+        elif isinstance(in_data, list):
+            return cls.__ref6570_list_expansion(
+                variable_name,
+                in_data,
+                explode,
+                percent_encode,
+                prefix_separator_iterator,
+                var_name_piece,
+                named_parameter_expansion
+            )
+        elif isinstance(in_data, dict):
+            return cls.__ref6570_dict_expansion(
+                variable_name,
+                in_data,
+                explode,
+                percent_encode,
+                prefix_separator_iterator,
+                var_name_piece,
+                named_parameter_expansion
+            )
+        # bool, bytes, etc
+        raise ApiValueError('Unable to generate a ref6570 representation of {}'.format(in_data))
+
+
+class StyleFormSerializer(ParameterSerializerBase):
+    @classmethod
+    def _get_default_explode(cls, style: ParameterStyle) -> bool:
+        if style is ParameterStyle.FORM:
+            return True
+        return super()._get_default_explode(style)
+
+    def _serialize_form(
+        self,
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        name: str,
+        explode: bool,
+        percent_encode: bool,
+        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
+    ) -> str:
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
+        return self._ref6570_expansion(
+            variable_name=name,
+            in_data=in_data,
+            explode=explode,
+            percent_encode=percent_encode,
+            prefix_separator_iterator=prefix_separator_iterator
+        )
+
+
+class StyleSimpleSerializer(ParameterSerializerBase):
+
+    def _serialize_simple(
+        self,
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        name: str,
+        explode: bool,
+        percent_encode: bool
+    ) -> str:
+        prefix_separator_iterator = PrefixSeparatorIterator('', ',')
+        return self._ref6570_expansion(
+            variable_name=name,
+            in_data=in_data,
+            explode=explode,
+            percent_encode=percent_encode,
+            prefix_separator_iterator=prefix_separator_iterator
+        )
+
+
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
+@dataclass
+class ParameterBase(JSONDetector):
+    name: str
+    in_type: ParameterInType
+    required: bool
+    style: typing.Optional[ParameterStyle]
+    explode: typing.Optional[bool]
+    allow_reserved: typing.Optional[bool]
+    schema: typing.Optional[typing.Type[Schema]]
+    content: typing.Optional[typing.Dict[str, typing.Type[Schema]]]
+
+    __style_to_in_type = {
+        ParameterStyle.MATRIX: {ParameterInType.PATH},
+        ParameterStyle.LABEL: {ParameterInType.PATH},
+        ParameterStyle.FORM: {ParameterInType.QUERY, ParameterInType.COOKIE},
+        ParameterStyle.SIMPLE: {ParameterInType.PATH, ParameterInType.HEADER},
+        ParameterStyle.SPACE_DELIMITED: {ParameterInType.QUERY},
+        ParameterStyle.PIPE_DELIMITED: {ParameterInType.QUERY},
+        ParameterStyle.DEEP_OBJECT: {ParameterInType.QUERY},
+    }
+    __in_type_to_default_style = {
+        ParameterInType.QUERY: ParameterStyle.FORM,
+        ParameterInType.PATH: ParameterStyle.SIMPLE,
+        ParameterInType.HEADER: ParameterStyle.SIMPLE,
+        ParameterInType.COOKIE: ParameterStyle.FORM,
+    }
+    __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
+    _json_encoder = JSONEncoder()
+
+    @classmethod
+    def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
+        if style is None:
+            return
+        in_type_set = cls.__style_to_in_type[style]
+        if in_type not in in_type_set:
+            raise ValueError(
+                'Invalid style and in_type combination. For style={} only in_type={} are allowed'.format(
+                    style, in_type_set
+                )
+            )
+
+    def __init__(
+        self,
+        name: str,
+        in_type: ParameterInType,
+        required: bool = False,
+        style: typing.Optional[ParameterStyle] = None,
+        explode: bool = False,
+        allow_reserved: typing.Optional[bool] = None,
+        schema: typing.Optional[typing.Type[Schema]] = None,
+        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
+    ):
+        if schema is None and content is None:
+            raise ValueError('Value missing; Pass in either schema or content')
+        if schema and content:
+            raise ValueError('Too many values provided. Both schema and content were provided. Only one may be input')
+        if name in self.__disallowed_header_names and in_type is ParameterInType.HEADER:
+            raise ValueError('Invalid name, name may not be one of {}'.format(self.__disallowed_header_names))
+        self.__verify_style_to_in_type(style, in_type)
+        if content is None and style is None:
+            style = self.__in_type_to_default_style[in_type]
+        if content is not None and in_type in self.__in_type_to_default_style and len(content) != 1:
+            raise ValueError('Invalid content length, content length must equal 1')
+        self.in_type = in_type
+        self.name = name
+        self.required = required
+        self.style = style
+        self.explode = explode
+        self.allow_reserved = allow_reserved
+        self.schema = schema
+        self.content = content
+
+    def _serialize_json(
+        self,
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
+    ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
+        return json.dumps(in_data)
+
+
+class PathParameter(ParameterBase, StyleSimpleSerializer):
+
+    def __init__(
+        self,
+        name: str,
+        required: bool = False,
+        style: typing.Optional[ParameterStyle] = None,
+        explode: bool = False,
+        allow_reserved: typing.Optional[bool] = None,
+        schema: typing.Optional[typing.Type[Schema]] = None,
+        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
+    ):
+        super().__init__(
+            name,
+            in_type=ParameterInType.PATH,
+            required=required,
+            style=style,
+            explode=explode,
+            allow_reserved=allow_reserved,
+            schema=schema,
+            content=content
+        )
+
+    def __serialize_label(
+        self,
+        in_data: typing.Union[None, int, float, str, bool, dict, list]
+    ) -> typing.Dict[str, str]:
+        prefix_separator_iterator = PrefixSeparatorIterator('.', '.')
+        value = self._ref6570_expansion(
+            variable_name=self.name,
+            in_data=in_data,
+            explode=self.explode,
+            percent_encode=True,
+            prefix_separator_iterator=prefix_separator_iterator
+        )
+        return self._to_dict(self.name, value)
+
+    def __serialize_matrix(
+        self,
+        in_data: typing.Union[None, int, float, str, bool, dict, list]
+    ) -> typing.Dict[str, str]:
+        prefix_separator_iterator = PrefixSeparatorIterator(';', ';')
+        value = self._ref6570_expansion(
+            variable_name=self.name,
+            in_data=in_data,
+            explode=self.explode,
+            percent_encode=True,
+            prefix_separator_iterator=prefix_separator_iterator
+        )
+        return self._to_dict(self.name, value)
+
+    def __serialize_simple(
+        self,
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+    ) -> typing.Dict[str, str]:
+        value = self._serialize_simple(
+            in_data=in_data,
+            name=self.name,
+            explode=self.explode,
+            percent_encode=True
+        )
+        return self._to_dict(self.name, value)
+
+    def serialize(
+        self,
+        in_data: typing.Union[
+            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
+    ) -> typing.Dict[str, str]:
+        if self.schema:
+            cast_in_data = self.schema(in_data)
+            cast_in_data = self._json_encoder.default(cast_in_data)
+            \\"\\"\\"
+            simple -> path
+                path:
+                    returns path_params: dict
+            label -> path
+                returns path_params
+            matrix -> path
+                returns path_params
+            \\"\\"\\"
+            if self.style:
+                if self.style is ParameterStyle.SIMPLE:
+                    return self.__serialize_simple(cast_in_data)
+                elif self.style is ParameterStyle.LABEL:
+                    return self.__serialize_label(cast_in_data)
+                elif self.style is ParameterStyle.MATRIX:
+                    return self.__serialize_matrix(cast_in_data)
+        # self.content will be length one
+        for content_type, schema in self.content.items():
+            cast_in_data = schema(in_data)
+            cast_in_data = self._json_encoder.default(cast_in_data)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data)
+                return self._to_dict(self.name, value)
+            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
+
+
+class QueryParameter(ParameterBase, StyleFormSerializer):
+
+    def __init__(
+        self,
+        name: str,
+        required: bool = False,
+        style: typing.Optional[ParameterStyle] = None,
+        explode: typing.Optional[bool] = None,
+        allow_reserved: typing.Optional[bool] = None,
+        schema: typing.Optional[typing.Type[Schema]] = None,
+        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
+    ):
+        used_style = ParameterStyle.FORM if style is None else style
+        used_explode = self._get_default_explode(used_style) if explode is None else explode
+
+        super().__init__(
+            name,
+            in_type=ParameterInType.QUERY,
+            required=required,
+            style=used_style,
+            explode=used_explode,
+            allow_reserved=allow_reserved,
+            schema=schema,
+            content=content
+        )
+
+    def __serialize_space_delimited(
+        self,
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
+    ) -> typing.Dict[str, str]:
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
+        value = self._ref6570_expansion(
+            variable_name=self.name,
+            in_data=in_data,
+            explode=self.explode,
+            percent_encode=True,
+            prefix_separator_iterator=prefix_separator_iterator
+        )
+        return self._to_dict(self.name, value)
+
+    def __serialize_pipe_delimited(
+        self,
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
+    ) -> typing.Dict[str, str]:
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
+        value = self._ref6570_expansion(
+            variable_name=self.name,
+            in_data=in_data,
+            explode=self.explode,
+            percent_encode=True,
+            prefix_separator_iterator=prefix_separator_iterator
+        )
+        return self._to_dict(self.name, value)
+
+    def __serialize_form(
+        self,
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
+    ) -> typing.Dict[str, str]:
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
+        value = self._serialize_form(
+            in_data,
+            name=self.name,
+            explode=self.explode,
+            percent_encode=True,
+            prefix_separator_iterator=prefix_separator_iterator
+        )
+        return self._to_dict(self.name, value)
+
+    def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
+        if self.style is ParameterStyle.FORM:
+            return PrefixSeparatorIterator('?', '&')
+        elif self.style is ParameterStyle.SPACE_DELIMITED:
+            return PrefixSeparatorIterator('', '%20')
+        elif self.style is ParameterStyle.PIPE_DELIMITED:
+            return PrefixSeparatorIterator('', '|')
+
+    def serialize(
+        self,
+        in_data: typing.Union[
+            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict],
+        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
+    ) -> typing.Dict[str, str]:
+        if self.schema:
+            cast_in_data = self.schema(in_data)
+            cast_in_data = self._json_encoder.default(cast_in_data)
+            \\"\\"\\"
+            form -> query
+                query:
+                    - GET/HEAD/DELETE: could use fields
+                    - PUT/POST: must use urlencode to send parameters
+                    returns fields: tuple
+            spaceDelimited -> query
+                returns fields
+            pipeDelimited -> query
+                returns fields
+            deepObject -> query, https://github.com/OAI/OpenAPI-Specification/issues/1706
+                returns fields
+            \\"\\"\\"
+            if self.style:
+                # TODO update query ones to omit setting values when [] {} or None is input
+                if self.style is ParameterStyle.FORM:
+                    return self.__serialize_form(cast_in_data, prefix_separator_iterator)
+                elif self.style is ParameterStyle.SPACE_DELIMITED:
+                    return self.__serialize_space_delimited(cast_in_data, prefix_separator_iterator)
+                elif self.style is ParameterStyle.PIPE_DELIMITED:
+                    return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
+        # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
+        for content_type, schema in self.content.items():
+            cast_in_data = schema(in_data)
+            cast_in_data = self._json_encoder.default(cast_in_data)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
+            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
+
+
+class CookieParameter(ParameterBase, StyleFormSerializer):
+
+    def __init__(
+        self,
+        name: str,
+        required: bool = False,
+        style: typing.Optional[ParameterStyle] = None,
+        explode: typing.Optional[bool] = None,
+        allow_reserved: typing.Optional[bool] = None,
+        schema: typing.Optional[typing.Type[Schema]] = None,
+        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
+    ):
+        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_explode = self._get_default_explode(used_style) if explode is None else explode
+
+        super().__init__(
+            name,
+            in_type=ParameterInType.COOKIE,
+            required=required,
+            style=used_style,
+            explode=used_explode,
+            allow_reserved=allow_reserved,
+            schema=schema,
+            content=content
+        )
+
+    def serialize(
+        self,
+        in_data: typing.Union[
+            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
+    ) -> typing.Dict[str, str]:
+        if self.schema:
+            cast_in_data = self.schema(in_data)
+            cast_in_data = self._json_encoder.default(cast_in_data)
+            \\"\\"\\"
+            form -> cookie
+                returns fields: tuple
+            \\"\\"\\"
+            if self.style:
+                \\"\\"\\"
+                TODO add escaping of comma, space, equals
+                or turn encoding on
+                \\"\\"\\"
+                value = self._serialize_form(
+                    cast_in_data,
+                    explode=self.explode,
+                    name=self.name,
+                    percent_encode=False,
+                    prefix_separator_iterator=PrefixSeparatorIterator('', '&')
+                )
+                return self._to_dict(self.name, value)
+        # self.content will be length one
+        for content_type, schema in self.content.items():
+            cast_in_data = schema(in_data)
+            cast_in_data = self._json_encoder.default(cast_in_data)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data)
+                return self._to_dict(self.name, value)
+            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
+
+
+class HeaderParameter(ParameterBase, StyleSimpleSerializer):
+    def __init__(
+        self,
+        name: str,
+        required: bool = False,
+        style: typing.Optional[ParameterStyle] = None,
+        explode: bool = False,
+        allow_reserved: typing.Optional[bool] = None,
+        schema: typing.Optional[typing.Type[Schema]] = None,
+        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
+    ):
+        super().__init__(
+            name,
+            in_type=ParameterInType.HEADER,
+            required=required,
+            style=style,
+            explode=explode,
+            allow_reserved=allow_reserved,
+            schema=schema,
+            content=content
+        )
+
+    @staticmethod
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
+        data = tuple(t for t in in_data if t)
+        headers = HTTPHeaderDict()
+        if not data:
+            return headers
+        headers.extend(data)
+        return headers
+
+    def serialize(
+        self,
+        in_data: typing.Union[
+            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
+    ) -> HTTPHeaderDict:
+        if self.schema:
+            cast_in_data = self.schema(in_data)
+            cast_in_data = self._json_encoder.default(cast_in_data)
+            \\"\\"\\"
+            simple -> header
+                headers: PoolManager needs a mapping, tuple is close
+                    returns headers: dict
+            \\"\\"\\"
+            if self.style:
+                value = self._serialize_simple(cast_in_data, self.name, self.explode, False)
+                return self.__to_headers(((self.name, value),))
+        # self.content will be length one
+        for content_type, schema in self.content.items():
+            cast_in_data = schema(in_data)
+            cast_in_data = self._json_encoder.default(cast_in_data)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data)
+                return self.__to_headers(((self.name, value),))
+            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
+
+
+class Encoding:
+    def __init__(
+        self,
+        content_type: str,
+        headers: typing.Optional[typing.Dict[str, HeaderParameter]] = None,
+        style: typing.Optional[ParameterStyle] = None,
+        explode: bool = False,
+        allow_reserved: bool = False,
+    ):
+        self.content_type = content_type
+        self.headers = headers
+        self.style = style
+        self.explode = explode
+        self.allow_reserved = allow_reserved
+
+
+@dataclass
+class MediaType:
+    \\"\\"\\"
+    Used to store request and response body schema information
+    encoding:
+        A map between a property name and its encoding information.
+        The key, being the property name, MUST exist in the schema as a property.
+        The encoding object SHALL only apply to requestBody objects when the media type is
+        multipart or application/x-www-form-urlencoded.
+    \\"\\"\\"
+    schema: typing.Optional[typing.Type[Schema]] = None
+    encoding: typing.Optional[typing.Dict[str, Encoding]] = None
+
+
+@dataclass
+class ApiResponse:
+    response: urllib3.HTTPResponse
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
+
+    def __init__(
+        self,
+        response: urllib3.HTTPResponse,
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
+    ):
+        \\"\\"\\"
+        pycharm needs this to prevent 'Unexpected argument' warnings
+        \\"\\"\\"
+        self.response = response
+        self.body = body
+        self.headers = headers
+
+
+@dataclass
+class ApiResponseWithoutDeserialization(ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[Unset, typing.Type[Schema]] = unset
+    headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
+
+
+class OpenApiResponse(JSONDetector):
+    __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
+
+    def __init__(
+        self,
+        response_cls: typing.Type[ApiResponse] = ApiResponse,
+        content: typing.Optional[typing.Dict[str, MediaType]] = None,
+        headers: typing.Optional[typing.List[HeaderParameter]] = None,
+    ):
+        self.headers = headers
+        if content is not None and len(content) == 0:
+            raise ValueError('Invalid value for content, the content dict must have >= 1 entry')
+        self.content = content
+        self.response_cls = response_cls
+
+    @staticmethod
+    def __deserialize_json(response: urllib3.HTTPResponse) -> typing.Any:
+        # python must be >= 3.9 so we can pass in bytes into json.loads
+        return json.loads(response.data)
+
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
+    @classmethod
+    def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
+        if content_disposition is None:
+            return None
+        match = cls.__filename_content_disposition_pattern.search(content_disposition)
+        if not match:
+            return None
+        return match.group(1)
+
+    def __deserialize_application_octet_stream(
+        self, response: urllib3.HTTPResponse
+    ) -> typing.Union[bytes, io.BufferedReader]:
+        \\"\\"\\"
+        urllib3 use cases:
+        1. when preload_content=True (stream=False) then supports_chunked_reads is False and bytes are returned
+        2. when preload_content=False (stream=True) then supports_chunked_reads is True and
+            a file will be written and returned
+        \\"\\"\\"
+        if response.supports_chunked_reads():
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
+
+            if file_name is None:
+                _fd, path = tempfile.mkstemp()
+            else:
+                path = os.path.join(tempfile.gettempdir(), file_name)
+
+            with open(path, 'wb') as new_file:
+                chunk_size = 1024
+                while True:
+                    data = response.read(chunk_size)
+                    if not data:
+                        break
+                    new_file.write(data)
+            # release_conn is needed for streaming connections only
+            response.release_conn()
+            new_file = open(path, 'rb')
+            return new_file
+        else:
+            return response.data
+
+    @staticmethod
+    def __deserialize_multipart_form_data(
+        response: urllib3.HTTPResponse
+    ) -> typing.Dict[str, typing.Any]:
+        msg = email.message_from_bytes(response.data)
+        return {
+            part.get_param(\\"name\\", header=\\"Content-Disposition\\"): part.get_payload(
+                decode=True
+            ).decode(part.get_content_charset())
+            if part.get_content_charset()
+            else part.get_payload()
+            for part in msg.get_payload()
+        }
+
+    def deserialize(self, response: urllib3.HTTPResponse, configuration: Configuration) -> ApiResponse:
+        content_type = response.getheader('content-type')
+        deserialized_body = unset
+        streamed = response.supports_chunked_reads()
+
+        deserialized_headers = unset
+        if self.headers is not None:
+            # TODO add header deserialiation here
+            pass
+
+        if self.content is not None:
+            if content_type not in self.content:
+                raise ApiValueError(
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
+                )
+            body_schema = self.content[content_type].schema
+            if body_schema is None:
+                # some specs do not define response content media type schemas
+                return self.response_cls(
+                    response=response,
+                    headers=deserialized_headers,
+                    body=unset
+                )
+
+            if self._content_type_is_json(content_type):
+                body_data = self.__deserialize_json(response)
+            elif content_type == 'application/octet-stream':
+                body_data = self.__deserialize_application_octet_stream(response)
+            elif content_type.startswith('multipart/form-data'):
+                body_data = self.__deserialize_multipart_form_data(response)
+                content_type = 'multipart/form-data'
+            else:
+                raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
+            deserialized_body = body_schema.from_openapi_data_oapg(
+                body_data, _configuration=configuration)
+        elif streamed:
+            response.release_conn()
+
+        return self.response_cls(
+            response=response,
+            headers=deserialized_headers,
+            body=deserialized_body
+        )
+
+
+class ApiClient:
+    \\"\\"\\"Generic API client for OpenAPI client library builds.
+
+    OpenAPI generic API client. This client handles the client-
+    server communication, and is invariant across implementations. Specifics of
+    the methods and models for each application are generated from the OpenAPI
+    templates.
+
+    NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+    Do not edit the class manually.
+
+    :param configuration: .Configuration object for this client
+    :param header_name: a header to pass when making calls to the API.
+    :param header_value: a header value to pass when making calls to
+        the API.
+    :param cookie: a cookie to include in the header when making calls
+        to the API
+    :param pool_threads: The number of threads to use for async requests
+        to the API. More threads means more concurrent API requests.
+    \\"\\"\\"
+
+    _pool = None
+
+    def __init__(
+        self,
+        configuration: typing.Optional[Configuration] = None,
+        header_name: typing.Optional[str] = None,
+        header_value: typing.Optional[str] = None,
+        cookie: typing.Optional[str] = None,
+        pool_threads: int = 1
+    ):
+        if configuration is None:
+            configuration = Configuration()
+        self.configuration = configuration
+        self.pool_threads = pool_threads
+
+        self.rest_client = rest.RESTClientObject(configuration)
+        self.default_headers = HTTPHeaderDict()
+        if header_name is not None:
+            self.default_headers[header_name] = header_value
+        self.cookie = cookie
+        # Set default User-Agent.
+        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.close()
+
+    def close(self):
+        if self._pool:
+            self._pool.close()
+            self._pool.join()
+            self._pool = None
+            if hasattr(atexit, 'unregister'):
+                atexit.unregister(self.close)
+
+    @property
+    def pool(self):
+        \\"\\"\\"Create thread pool on first request
+         avoids instantiating unused threadpool for blocking clients.
+        \\"\\"\\"
+        if self._pool is None:
+            atexit.register(self.close)
+            self._pool = ThreadPool(self.pool_threads)
+        return self._pool
+
+    @property
+    def user_agent(self):
+        \\"\\"\\"User agent for this API client\\"\\"\\"
+        return self.default_headers['User-Agent']
+
+    @user_agent.setter
+    def user_agent(self, value):
+        self.default_headers['User-Agent'] = value
+
+    def set_default_header(self, header_name, header_value):
+        self.default_headers[header_name] = header_value
+
+    def __call_api(
+        self,
+        resource_path: str,
+        method: str,
+        headers: typing.Optional[HTTPHeaderDict] = None,
+        body: typing.Optional[typing.Union[str, bytes]] = None,
+        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
+        auth_settings: typing.Optional[typing.List[str]] = None,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        host: typing.Optional[str] = None,
+    ) -> urllib3.HTTPResponse:
+
+        # header parameters
+        used_headers = HTTPHeaderDict(self.default_headers)
+        if self.cookie:
+            headers['Cookie'] = self.cookie
+
+        # auth setting
+        self.update_params_for_auth(used_headers,
+                                    auth_settings, resource_path, method, body)
+
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
+        # request url
+        if host is None:
+            url = self.configuration.host + resource_path
+        else:
+            # use server/host defined in path or operation instead
+            url = host + resource_path
+
+        # perform request and return response
+        response = self.request(
+            method,
+            url,
+            headers=used_headers,
+            fields=fields,
+            body=body,
+            stream=stream,
+            timeout=timeout,
+        )
+        return response
+
+    def call_api(
+        self,
+        resource_path: str,
+        method: str,
+        headers: typing.Optional[HTTPHeaderDict] = None,
+        body: typing.Optional[typing.Union[str, bytes]] = None,
+        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
+        auth_settings: typing.Optional[typing.List[str]] = None,
+        async_req: typing.Optional[bool] = None,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        host: typing.Optional[str] = None,
+    ) -> urllib3.HTTPResponse:
+        \\"\\"\\"Makes the HTTP request (synchronous) and returns deserialized data.
+
+        To make an async_req request, set the async_req parameter.
+
+        :param resource_path: Path to method endpoint.
+        :param method: Method to call.
+        :param headers: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param fields: Request post form parameters,
+            for \`application/x-www-form-urlencoded\`, \`multipart/form-data\`.
+        :param auth_settings: Auth Settings names for the request.
+        :param async_req: execute request asynchronously
+        :type async_req: bool, optional TODO remove, unused
+        :param stream: if True, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Also when True, if the openapi spec describes a file download,
+                                 the data will be written to a local filesystme file and the BinarySchema
+                                 instance will also inherit from FileSchema and FileIO
+                                 Default is False.
+        :type stream: bool, optional
+        :param timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :param host: api endpoint host
+        :return:
+            If async_req parameter is True,
+            the request will be called asynchronously.
+            The method will return the request thread.
+            If parameter async_req is False or missing,
+            then the method will return the response directly.
+        \\"\\"\\"
+
+        if not async_req:
+            return self.__call_api(
+                resource_path,
+                method,
+                headers,
+                body,
+                fields,
+                auth_settings,
+                stream,
+                timeout,
+                host,
+            )
+
+        return self.pool.apply_async(
+            self.__call_api,
+            (
+                resource_path,
+                method,
+                headers,
+                body,
+                json,
+                fields,
+                auth_settings,
+                stream,
+                timeout,
+                host,
+            )
+        )
+
+    def request(
+        self,
+        method: str,
+        url: str,
+        headers: typing.Optional[HTTPHeaderDict] = None,
+        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
+        body: typing.Optional[typing.Union[str, bytes]] = None,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> urllib3.HTTPResponse:
+        \\"\\"\\"Makes the HTTP request using RESTClient.\\"\\"\\"
+        if method == \\"GET\\":
+            return self.rest_client.GET(url,
+                                        stream=stream,
+                                        timeout=timeout,
+                                        headers=headers)
+        elif method == \\"HEAD\\":
+            return self.rest_client.HEAD(url,
+                                         stream=stream,
+                                         timeout=timeout,
+                                         headers=headers)
+        elif method == \\"OPTIONS\\":
+            return self.rest_client.OPTIONS(url,
+                                            headers=headers,
+                                            fields=fields,
+                                            stream=stream,
+                                            timeout=timeout,
+                                            body=body)
+        elif method == \\"POST\\":
+            return self.rest_client.POST(url,
+                                         headers=headers,
+                                         fields=fields,
+                                         stream=stream,
+                                         timeout=timeout,
+                                         body=body)
+        elif method == \\"PUT\\":
+            return self.rest_client.PUT(url,
+                                        headers=headers,
+                                        fields=fields,
+                                        stream=stream,
+                                        timeout=timeout,
+                                        body=body)
+        elif method == \\"PATCH\\":
+            return self.rest_client.PATCH(url,
+                                          headers=headers,
+                                          fields=fields,
+                                          stream=stream,
+                                          timeout=timeout,
+                                          body=body)
+        elif method == \\"DELETE\\":
+            return self.rest_client.DELETE(url,
+                                           headers=headers,
+                                           stream=stream,
+                                           timeout=timeout,
+                                           body=body)
+        else:
+            raise ApiValueError(
+                \\"http method must be \`GET\`, \`HEAD\`, \`OPTIONS\`,\\"
+                \\" \`POST\`, \`PATCH\`, \`PUT\` or \`DELETE\`.\\"
+            )
+
+    def update_params_for_auth(self, headers, auth_settings,
+                               resource_path, method, body):
+        \\"\\"\\"Updates header and query params based on authentication setting.
+
+        :param headers: Header parameters dict to be updated.
+        :param auth_settings: Authentication setting identifiers list.
+        :param resource_path: A string representation of the HTTP request resource path.
+        :param method: A string representation of the HTTP request method.
+        :param body: A object representing the body of the HTTP request.
+            The object type is the return value of _encoder.default().
+        \\"\\"\\"
+        if not auth_settings:
+            return
+
+        for auth in auth_settings:
+            auth_setting = self.configuration.auth_settings().get(auth)
+            if not auth_setting:
+                continue
+            if auth_setting['in'] == 'cookie':
+                headers.add('Cookie', auth_setting['value'])
+            elif auth_setting['in'] == 'header':
+                if auth_setting['type'] != 'http-signature':
+                    headers.add(auth_setting['key'], auth_setting['value'])
+            elif auth_setting['in'] == 'query':
+                \\"\\"\\" TODO implement auth in query
+                need to pass in prefix_separator_iterator
+                and need to output resource_path with query params added
+                \\"\\"\\"
+                raise ApiValueError(\\"Auth in query not yet implemented\\")
+            else:
+                raise ApiValueError(
+                    'Authentication token must be in \`query\` or \`header\`'
+                )
+
+
+class Api:
+    \\"\\"\\"NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    \\"\\"\\"
+
+    def __init__(self, api_client: typing.Optional[ApiClient] = None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    @staticmethod
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
+        \\"\\"\\"
+        Ensures that:
+        - required keys are present
+        - additional properties are not input
+        - value stored under required keys do not have the value unset
+        Note: detailed value checking is done in schema classes
+        \\"\\"\\"
+        missing_required_keys = []
+        required_keys_with_unset_values = []
+        for required_key in cls.__required_keys__:
+            if required_key not in data:
+                missing_required_keys.append(required_key)
+                continue
+            value = data[required_key]
+            if value is unset:
+                required_keys_with_unset_values.append(required_key)
+        if missing_required_keys:
+            raise ApiTypeError(
+                '{} missing {} required arguments: {}'.format(
+                    cls.__name__, len(missing_required_keys), missing_required_keys
+                 )
+             )
+        if required_keys_with_unset_values:
+            raise ApiValueError(
+                '{} contains invalid unset values for {} required keys: {}'.format(
+                    cls.__name__, len(required_keys_with_unset_values), required_keys_with_unset_values
+                )
+            )
+
+        disallowed_additional_keys = []
+        for key in data:
+            if key in cls.__required_keys__ or key in cls.__optional_keys__:
+                continue
+            disallowed_additional_keys.append(key)
+        if disallowed_additional_keys:
+            raise ApiTypeError(
+                '{} got {} unexpected keyword arguments: {}'.format(
+                    cls.__name__, len(disallowed_additional_keys), disallowed_additional_keys
+                )
+            )
+
+    def _get_host_oapg(
+        self,
+        operation_id: str,
+        servers: typing.Tuple[typing.Dict[str, str], ...] = tuple(),
+        host_index: typing.Optional[int] = None
+    ) -> typing.Optional[str]:
+        configuration = self.api_client.configuration
+        try:
+            if host_index is None:
+                index = configuration.server_operation_index.get(
+                    operation_id, configuration.server_index
+                )
+            else:
+                index = host_index
+            server_variables = configuration.server_operation_variables.get(
+                operation_id, configuration.server_variables
+            )
+            host = configuration.get_host_from_settings(
+                index, variables=server_variables, servers=servers
+            )
+        except IndexError:
+            if servers:
+                raise ApiValueError(
+                    \\"Invalid host index. Must be 0 <= index < %s\\" %
+                    len(servers)
+                )
+            host = None
+        return host
+
+
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
+    body: typing.Union[str, bytes]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
+
+
+class RequestBody(StyleFormSerializer, JSONDetector):
+    \\"\\"\\"
+    A request body parameter
+    content: content_type to MediaType Schema info
+    \\"\\"\\"
+    __json_encoder = JSONEncoder()
+
+    def __init__(
+        self,
+        content: typing.Dict[str, MediaType],
+        required: bool = False,
+    ):
+        self.required = required
+        if len(content) == 0:
+            raise ValueError('Invalid value for content, the content dict must have >= 1 entry')
+        self.content = content
+
+    def __serialize_json(
+        self,
+        in_data: typing.Any
+    ) -> typing.Dict[str, bytes]:
+        in_data = self.__json_encoder.default(in_data)
+        json_str = json.dumps(in_data, separators=(\\",\\", \\":\\"), ensure_ascii=False).encode(
+            \\"utf-8\\"
+        )
+        return dict(body=json_str)
+
+    @staticmethod
+    def __serialize_text_plain(in_data: typing.Any) -> typing.Dict[str, str]:
+        if isinstance(in_data, frozendict.frozendict):
+            raise ValueError('Unable to serialize type frozendict.frozendict to text/plain')
+        elif isinstance(in_data, tuple):
+            raise ValueError('Unable to serialize type tuple to text/plain')
+        elif isinstance(in_data, NoneClass):
+            raise ValueError('Unable to serialize type NoneClass to text/plain')
+        elif isinstance(in_data, BoolClass):
+            raise ValueError('Unable to serialize type BoolClass to text/plain')
+        return dict(body=str(in_data))
+
+    def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
+        json_value = self.__json_encoder.default(value)
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
+
+    def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
+        if isinstance(value, str):
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
+        elif isinstance(value, bytes):
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
+        elif isinstance(value, FileIO):
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
+            value.close()
+        else:
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
+
+    def __serialize_multipart_form_data(
+        self, in_data: Schema
+    ) -> typing.Dict[str, typing.Tuple[RequestField, ...]]:
+        if not isinstance(in_data, frozendict.frozendict):
+            raise ValueError(f'Unable to serialize {in_data} to multipart/form-data because it is not a dict of data')
+        \\"\\"\\"
+        In a multipart/form-data request body, each schema property, or each element of a schema array property,
+        takes a section in the payload with an internal header as defined by RFC7578. The serialization strategy
+        for each property of a multipart/form-data request body can be specified in an associated Encoding Object.
+
+        When passing in multipart types, boundaries MAY be used to separate sections of the content being
+        transferred – thus, the following default Content-Types are defined for multipart:
+
+        If the (object) property is a primitive, or an array of primitive values, the default Content-Type is text/plain
+        If the property is complex, or an array of complex values, the default Content-Type is application/json
+            Question: how is the array of primitives encoded?
+        If the property is a type: string with a contentEncoding, the default Content-Type is application/octet-stream
+        \\"\\"\\"
+        fields = []
+        for key, value in in_data.items():
+            if isinstance(value, tuple):
+                if value:
+                    # values use explode = True, so the code makes a RequestField for each item with name=key
+                    for item in value:
+                        request_field = self.__multipart_form_item(key=key, value=item)
+                        fields.append(request_field)
+                else:
+                    # send an empty array as json because exploding will not send it
+                    request_field = self.__multipart_json_item(key=key, value=value)
+                    fields.append(request_field)
+            else:
+                request_field = self.__multipart_form_item(key=key, value=value)
+                fields.append(request_field)
+
+        return dict(fields=tuple(fields))
+
+    def __serialize_application_octet_stream(self, in_data: BinarySchema) -> typing.Dict[str, bytes]:
+        if isinstance(in_data, bytes):
+            return dict(body=in_data)
+        # FileIO type
+        result = dict(body=in_data.read())
+        in_data.close()
+        return result
+
+    def __serialize_application_x_www_form_data(
+        self, in_data: typing.Any
+    ) -> SerializedRequestBody:
+        \\"\\"\\"
+        POST submission of form data in body
+        \\"\\"\\"
+        if not isinstance(in_data, frozendict.frozendict):
+            raise ValueError(
+                f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
+        cast_in_data = self.__json_encoder.default(in_data)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
+        return dict(body=value)
+
+    def serialize(
+        self, in_data: typing.Any, content_type: str
+    ) -> SerializedRequestBody:
+        \\"\\"\\"
+        If a str is returned then the result will be assigned to data when making the request
+        If a tuple is returned then the result will be used as fields input in encode_multipart_formdata
+        Return a tuple of
+
+        The key of the return dict is
+        - body for application/json
+        - encode_multipart and fields for multipart/form-data
+        \\"\\"\\"
+        media_type = self.content[content_type]
+        if isinstance(in_data, media_type.schema):
+            cast_in_data = in_data
+        elif isinstance(in_data, (dict, frozendict.frozendict)) and in_data:
+            cast_in_data = media_type.schema(**in_data)
+        else:
+            cast_in_data = media_type.schema(in_data)
+        # TODO check for and use encoding if it exists
+        # and content_type is multipart or application/x-www-form-urlencoded
+        if self._content_type_is_json(content_type):
+            return self.__serialize_json(cast_in_data)
+        elif content_type == 'text/plain':
+            return self.__serialize_text_plain(cast_in_data)
+        elif content_type == 'multipart/form-data':
+            return self.__serialize_multipart_form_data(cast_in_data)
+        elif content_type == 'application/x-www-form-urlencoded':
+            return self.__serialize_application_x_www_form_data(cast_in_data)
+        elif content_type == 'application/octet-stream':
+            return self.__serialize_application_octet_stream(cast_in_data)
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
+  "test/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all endpoints then import them from
+# tags, paths, or path_to_api, or tag_to_api",
+  "test/apis/path_to_api.py": "import typing_extensions
+
+from test.paths import PathValues
+from test.apis.paths.tag1 import Tag1
+from test.apis.paths.tag2 import Tag2
+from test.apis.paths.both import Both
+from test.apis.paths.neither import Neither
+
+PathToApi = typing_extensions.TypedDict(
+    'PathToApi',
+    {
+        PathValues.TAG1: Tag1,
+        PathValues.TAG2: Tag2,
+        PathValues.BOTH: Both,
+        PathValues.NEITHER: Neither,
+    }
+)
+
+path_to_api = PathToApi(
+    {
+        PathValues.TAG1: Tag1,
+        PathValues.TAG2: Tag2,
+        PathValues.BOTH: Both,
+        PathValues.NEITHER: Neither,
+    }
+)
+",
+  "test/apis/paths/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all endpoints from this module, import them with
+# from test.apis.path_to_api import path_to_api
+",
+  "test/apis/paths/both.py": "from test.paths.both.get import ApiForget
+
+
+class Both(
+    ApiForget,
+):
+    pass
+",
+  "test/apis/paths/neither.py": "from test.paths.neither.get import ApiForget
+
+
+class Neither(
+    ApiForget,
+):
+    pass
+",
+  "test/apis/paths/tag1.py": "from test.paths.tag1.get import ApiForget
+
+
+class Tag1(
+    ApiForget,
+):
+    pass
+",
+  "test/apis/paths/tag2.py": "from test.paths.tag2.get import ApiForget
+
+
+class Tag2(
+    ApiForget,
+):
+    pass
+",
+  "test/apis/tag_to_api.py": "import typing_extensions
+
+from test.apis.tags import TagValues
+from test.apis.tags.default_api import DefaultApi
+from test.apis.tags.tag1_api import Tag1Api
+from test.apis.tags.tag2_api import Tag2Api
+
+TagToApi = typing_extensions.TypedDict(
+    'TagToApi',
+    {
+        TagValues.DEFAULT: DefaultApi,
+        TagValues.TAG1: Tag1Api,
+        TagValues.TAG2: Tag2Api,
+    }
+)
+
+tag_to_api = TagToApi(
+    {
+        TagValues.DEFAULT: DefaultApi,
+        TagValues.TAG1: Tag1Api,
+        TagValues.TAG2: Tag2Api,
+    }
+)
+",
+  "test/apis/tags/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all endpoints from this module, import them with
+# from test.apis.tag_to_api import tag_to_api
+
+import enum
+
+
+class TagValues(str, enum.Enum):
+    DEFAULT = \\"default\\"
+    TAG1 = \\"tag1\\"
+    TAG2 = \\"tag2\\"
+",
+  "test/apis/tags/default_api.py": "# coding: utf-8
+
+\\"\\"\\"
+    Multiple Tags Test
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from test.paths.neither.get import Neither
+
+
+class DefaultApi(
+    Neither,
+):
+    \\"\\"\\"NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    \\"\\"\\"
+    pass
+",
+  "test/apis/tags/default_api_operation_config.py": "import urllib.parse
+import json
+from typing import Callable, Any, Dict, List, NamedTuple, TypeVar, Generic, Union, TypedDict, Protocol, Optional, Literal
+from functools import wraps
+from dataclasses import dataclass, fields
+
+
+from test.schemas import (
+    date,
+    datetime,
+    file_type,
+    none_type,
+)
+from test.api_client import JSONEncoder
+
+T = TypeVar('T')
+
+# Generic type for object keyed by operation names
+@dataclass
+class OperationConfig(Generic[T]):
+    neither: T
+    both: T
+    tag1: T
+    tag2: T
+    ...
+
+# Look up path and http method for a given operation name
+OperationLookup = {
+    \\"neither\\": {
+        \\"path\\": \\"/neither\\",
+        \\"method\\": \\"get\\",
+    },
+    \\"both\\": {
+        \\"path\\": \\"/both\\",
+        \\"method\\": \\"get\\",
+    },
+    \\"tag1\\": {
+        \\"path\\": \\"/tag1\\",
+        \\"method\\": \\"get\\",
+    },
+    \\"tag2\\": {
+        \\"path\\": \\"/tag2\\",
+        \\"method\\": \\"get\\",
+    },
+}
+
+class Operations:
+    @staticmethod
+    def all(value: T) -> OperationConfig[T]:
+        \\"\\"\\"
+        Returns an OperationConfig with the same value for every operation
+        \\"\\"\\"
+        return OperationConfig(**{ operation_id: value for operation_id, _ in OperationLookup.items() })
+
+def uri_decode(value):
+    \\"\\"\\"
+    URI decode a value or list of values
+    \\"\\"\\"
+    if isinstance(value, list):
+        return [urllib.parse.unquote(v) for v in value]
+    return urllib.parse.unquote(value)
+
+def decode_request_parameters(parameters):
+    \\"\\"\\"
+    URI decode api request parameters (path, query or multi-value query)
+    \\"\\"\\"
+    return { key: uri_decode(parameters[key]) if parameters[key] is not None else parameters[key] for key in parameters.keys() }
+
+def parse_body(body, content_types, model):
+    \\"\\"\\"
+    Parse the body of an api request into the given model if present
+    \\"\\"\\"
+    if len([c for c in content_types if c != 'application/json']) == 0:
+        body = json.loads(body or '{}')
+        if model != Any:
+            body = model(**body)
+    return body
+
+
+RequestParameters = TypeVar('RequestParameters')
+RequestArrayParameters = TypeVar('RequestArrayParameters')
+RequestBody = TypeVar('RequestBody')
+ResponseBody = TypeVar('ResponseBody')
+StatusCode = TypeVar('StatusCode')
+
+@dataclass
+class ApiRequest(Generic[RequestParameters, RequestArrayParameters, RequestBody]):
+    request_parameters: RequestParameters
+    request_array_parameters: RequestArrayParameters
+    body: RequestBody
+    event: Any
+    context: Any
+    interceptor_context: Dict[str, Any]
+
+@dataclass
+class ChainedApiRequest(ApiRequest[RequestParameters, RequestArrayParameters, RequestBody],
+    Generic[RequestParameters, RequestArrayParameters, RequestBody]):
+
+    chain: 'HandlerChain'
+
+@dataclass
+class ApiResponse(Generic[StatusCode, ResponseBody]):
+    status_code: StatusCode
+    headers: Dict[str, str]
+    body: ResponseBody
+
+class HandlerChain(Generic[RequestParameters, RequestArrayParameters, RequestBody, StatusCode, ResponseBody]):
+    def next(self, request: ChainedApiRequest[RequestParameters, RequestArrayParameters, RequestBody]) -> ApiResponse[StatusCode, ResponseBody]:
+        raise Exception(\\"Not implemented!\\")
+
+def _build_handler_chain(_interceptors, handler) -> HandlerChain:
+    if len(_interceptors) == 0:
+        class BaseHandlerChain(HandlerChain[RequestParameters, RequestArrayParameters, RequestBody, StatusCode, ResponseBody]):
+            def next(self, request: ApiRequest[RequestParameters, RequestArrayParameters, RequestBody]) -> ApiResponse[StatusCode, ResponseBody]:
+                return handler(request)
+        return BaseHandlerChain()
+    else:
+        interceptor = _interceptors[0]
+
+        class RemainingHandlerChain(HandlerChain[RequestParameters, RequestArrayParameters, RequestBody, StatusCode, ResponseBody]):
+            def next(self, request: ChainedApiRequest[RequestParameters, RequestArrayParameters, RequestBody]) -> ApiResponse[StatusCode, ResponseBody]:
+                return interceptor(ChainedApiRequest(
+                    request_parameters = request.request_parameters,
+                    request_array_parameters = request.request_array_parameters,
+                    body = request.body,
+                    event = request.event,
+                    context = request.context,
+                    interceptor_context = request.interceptor_context,
+                    chain = _build_handler_chain(_interceptors[1:len(_interceptors)], handler),
+                ))
+        return RemainingHandlerChain()
+
+
+# Request parameters are single value query params or path params
+class NeitherRequestParameters(TypedDict):
+    ...
+
+# Request array parameters are multi-value query params
+class NeitherRequestArrayParameters(TypedDict):
+    ...
+
+# Request body type (default to Any when no body parameters exist, or leave unchanged as str if it's a primitive type)
+NeitherRequestBody = Any
+
+Neither200OperationResponse = ApiResponse[Literal[200], None]
+NeitherOperationResponses = Union[Neither200OperationResponse, ]
+
+# Request type for neither
+NeitherRequest = ApiRequest[NeitherRequestParameters, NeitherRequestArrayParameters, NeitherRequestBody]
+NeitherChainedRequest = ChainedApiRequest[NeitherRequestParameters, NeitherRequestArrayParameters, NeitherRequestBody]
+
+class NeitherHandlerFunction(Protocol):
+    def __call__(self, input: NeitherRequest, **kwargs) -> NeitherOperationResponses:
+        ...
+
+NeitherInterceptor = Callable[[NeitherChainedRequest], NeitherOperationResponses]
+
+def neither_handler(_handler: NeitherHandlerFunction = None, interceptors: List[NeitherInterceptor] = []):
+    \\"\\"\\"
+    Decorator for an api handler for the neither operation, providing a typed interface for inputs and outputs
+    \\"\\"\\"
+    def _handler_wrapper(handler: NeitherHandlerFunction):
+        @wraps(handler)
+        def wrapper(event, context, additional_interceptors = [], **kwargs):
+            request_parameters = decode_request_parameters({
+                **(event['pathParameters'] or {}),
+                **(event['queryStringParameters'] or {}),
+            })
+            request_array_parameters = decode_request_parameters({
+                **(event['multiValueQueryStringParameters'] or {}),
+            })
+            body = {}
+            interceptor_context = {}
+
+            chain = _build_handler_chain(additional_interceptors + interceptors, handler)
+            response = chain.next(ApiRequest(
+                request_parameters,
+                request_array_parameters,
+                body,
+                event,
+                context,
+                interceptor_context,
+            ), **kwargs)
+
+            response_body = ''
+            if response.body is None:
+                pass
+            elif response.status_code == 200:
+                response_body = response.body
+
+            return {
+                'statusCode': response.status_code,
+                'headers': response.headers,
+                'body': response_body,
+            }
+        return wrapper
+
+    # Support use as a decorator with no arguments, or with interceptor arguments
+    if callable(_handler):
+        return _handler_wrapper(_handler)
+    elif _handler is None:
+        return _handler_wrapper
+    else:
+        raise Exception(\\"Positional arguments are not supported by neither_handler.\\")
+
+# Request parameters are single value query params or path params
+class BothRequestParameters(TypedDict):
+    ...
+
+# Request array parameters are multi-value query params
+class BothRequestArrayParameters(TypedDict):
+    ...
+
+# Request body type (default to Any when no body parameters exist, or leave unchanged as str if it's a primitive type)
+BothRequestBody = Any
+
+Both200OperationResponse = ApiResponse[Literal[200], None]
+BothOperationResponses = Union[Both200OperationResponse, ]
+
+# Request type for both
+BothRequest = ApiRequest[BothRequestParameters, BothRequestArrayParameters, BothRequestBody]
+BothChainedRequest = ChainedApiRequest[BothRequestParameters, BothRequestArrayParameters, BothRequestBody]
+
+class BothHandlerFunction(Protocol):
+    def __call__(self, input: BothRequest, **kwargs) -> BothOperationResponses:
+        ...
+
+BothInterceptor = Callable[[BothChainedRequest], BothOperationResponses]
+
+def both_handler(_handler: BothHandlerFunction = None, interceptors: List[BothInterceptor] = []):
+    \\"\\"\\"
+    Decorator for an api handler for the both operation, providing a typed interface for inputs and outputs
+    \\"\\"\\"
+    def _handler_wrapper(handler: BothHandlerFunction):
+        @wraps(handler)
+        def wrapper(event, context, additional_interceptors = [], **kwargs):
+            request_parameters = decode_request_parameters({
+                **(event['pathParameters'] or {}),
+                **(event['queryStringParameters'] or {}),
+            })
+            request_array_parameters = decode_request_parameters({
+                **(event['multiValueQueryStringParameters'] or {}),
+            })
+            body = {}
+            interceptor_context = {}
+
+            chain = _build_handler_chain(additional_interceptors + interceptors, handler)
+            response = chain.next(ApiRequest(
+                request_parameters,
+                request_array_parameters,
+                body,
+                event,
+                context,
+                interceptor_context,
+            ), **kwargs)
+
+            response_body = ''
+            if response.body is None:
+                pass
+            elif response.status_code == 200:
+                response_body = response.body
+
+            return {
+                'statusCode': response.status_code,
+                'headers': response.headers,
+                'body': response_body,
+            }
+        return wrapper
+
+    # Support use as a decorator with no arguments, or with interceptor arguments
+    if callable(_handler):
+        return _handler_wrapper(_handler)
+    elif _handler is None:
+        return _handler_wrapper
+    else:
+        raise Exception(\\"Positional arguments are not supported by both_handler.\\")
+
+# Request parameters are single value query params or path params
+class Tag1RequestParameters(TypedDict):
+    ...
+
+# Request array parameters are multi-value query params
+class Tag1RequestArrayParameters(TypedDict):
+    ...
+
+# Request body type (default to Any when no body parameters exist, or leave unchanged as str if it's a primitive type)
+Tag1RequestBody = Any
+
+Tag1200OperationResponse = ApiResponse[Literal[200], None]
+Tag1OperationResponses = Union[Tag1200OperationResponse, ]
+
+# Request type for tag1
+Tag1Request = ApiRequest[Tag1RequestParameters, Tag1RequestArrayParameters, Tag1RequestBody]
+Tag1ChainedRequest = ChainedApiRequest[Tag1RequestParameters, Tag1RequestArrayParameters, Tag1RequestBody]
+
+class Tag1HandlerFunction(Protocol):
+    def __call__(self, input: Tag1Request, **kwargs) -> Tag1OperationResponses:
+        ...
+
+Tag1Interceptor = Callable[[Tag1ChainedRequest], Tag1OperationResponses]
+
+def tag1_handler(_handler: Tag1HandlerFunction = None, interceptors: List[Tag1Interceptor] = []):
+    \\"\\"\\"
+    Decorator for an api handler for the tag1 operation, providing a typed interface for inputs and outputs
+    \\"\\"\\"
+    def _handler_wrapper(handler: Tag1HandlerFunction):
+        @wraps(handler)
+        def wrapper(event, context, additional_interceptors = [], **kwargs):
+            request_parameters = decode_request_parameters({
+                **(event['pathParameters'] or {}),
+                **(event['queryStringParameters'] or {}),
+            })
+            request_array_parameters = decode_request_parameters({
+                **(event['multiValueQueryStringParameters'] or {}),
+            })
+            body = {}
+            interceptor_context = {}
+
+            chain = _build_handler_chain(additional_interceptors + interceptors, handler)
+            response = chain.next(ApiRequest(
+                request_parameters,
+                request_array_parameters,
+                body,
+                event,
+                context,
+                interceptor_context,
+            ), **kwargs)
+
+            response_body = ''
+            if response.body is None:
+                pass
+            elif response.status_code == 200:
+                response_body = response.body
+
+            return {
+                'statusCode': response.status_code,
+                'headers': response.headers,
+                'body': response_body,
+            }
+        return wrapper
+
+    # Support use as a decorator with no arguments, or with interceptor arguments
+    if callable(_handler):
+        return _handler_wrapper(_handler)
+    elif _handler is None:
+        return _handler_wrapper
+    else:
+        raise Exception(\\"Positional arguments are not supported by tag1_handler.\\")
+
+# Request parameters are single value query params or path params
+class Tag2RequestParameters(TypedDict):
+    ...
+
+# Request array parameters are multi-value query params
+class Tag2RequestArrayParameters(TypedDict):
+    ...
+
+# Request body type (default to Any when no body parameters exist, or leave unchanged as str if it's a primitive type)
+Tag2RequestBody = Any
+
+Tag2200OperationResponse = ApiResponse[Literal[200], None]
+Tag2OperationResponses = Union[Tag2200OperationResponse, ]
+
+# Request type for tag2
+Tag2Request = ApiRequest[Tag2RequestParameters, Tag2RequestArrayParameters, Tag2RequestBody]
+Tag2ChainedRequest = ChainedApiRequest[Tag2RequestParameters, Tag2RequestArrayParameters, Tag2RequestBody]
+
+class Tag2HandlerFunction(Protocol):
+    def __call__(self, input: Tag2Request, **kwargs) -> Tag2OperationResponses:
+        ...
+
+Tag2Interceptor = Callable[[Tag2ChainedRequest], Tag2OperationResponses]
+
+def tag2_handler(_handler: Tag2HandlerFunction = None, interceptors: List[Tag2Interceptor] = []):
+    \\"\\"\\"
+    Decorator for an api handler for the tag2 operation, providing a typed interface for inputs and outputs
+    \\"\\"\\"
+    def _handler_wrapper(handler: Tag2HandlerFunction):
+        @wraps(handler)
+        def wrapper(event, context, additional_interceptors = [], **kwargs):
+            request_parameters = decode_request_parameters({
+                **(event['pathParameters'] or {}),
+                **(event['queryStringParameters'] or {}),
+            })
+            request_array_parameters = decode_request_parameters({
+                **(event['multiValueQueryStringParameters'] or {}),
+            })
+            body = {}
+            interceptor_context = {}
+
+            chain = _build_handler_chain(additional_interceptors + interceptors, handler)
+            response = chain.next(ApiRequest(
+                request_parameters,
+                request_array_parameters,
+                body,
+                event,
+                context,
+                interceptor_context,
+            ), **kwargs)
+
+            response_body = ''
+            if response.body is None:
+                pass
+            elif response.status_code == 200:
+                response_body = response.body
+
+            return {
+                'statusCode': response.status_code,
+                'headers': response.headers,
+                'body': response_body,
+            }
+        return wrapper
+
+    # Support use as a decorator with no arguments, or with interceptor arguments
+    if callable(_handler):
+        return _handler_wrapper(_handler)
+    elif _handler is None:
+        return _handler_wrapper
+    else:
+        raise Exception(\\"Positional arguments are not supported by tag2_handler.\\")
+
+Interceptor = Callable[[ChainedApiRequest[RequestParameters, RequestArrayParameters, RequestBody]], ApiResponse[StatusCode, ResponseBody]]
+
+def concat_method_and_path(method: str, path: str):
+    return \\"{}||{}\\".format(method.lower(), path)
+
+OperationIdByMethodAndPath = { concat_method_and_path(method_and_path[\\"method\\"], method_and_path[\\"path\\"]): operation for operation, method_and_path in OperationLookup.items() }
+
+@dataclass
+class HandlerRouterHandlers:
+  neither: Callable[[Dict, Any], Dict]
+  both: Callable[[Dict, Any], Dict]
+  tag1: Callable[[Dict, Any], Dict]
+  tag2: Callable[[Dict, Any], Dict]
+
+def handler_router(handlers: HandlerRouterHandlers, interceptors: List[Interceptor] = []):
+    \\"\\"\\"
+    Returns a lambda handler which can be used to route requests to the appropriate typed lambda handler function.
+    \\"\\"\\"
+    _handlers = { field.name: getattr(handlers, field.name) for field in fields(handlers) }
+
+    def handler_wrapper(event, context):
+        operation_id = OperationIdByMethodAndPath[concat_method_and_path(event['requestContext']['httpMethod'], event['requestContext']['resourcePath'])]
+        handler = _handlers[operation_id]
+        return handler(event, context, additional_interceptors=interceptors)
+    return handler_wrapper
+",
+  "test/apis/tags/tag1_api.py": "# coding: utf-8
+
+\\"\\"\\"
+    Multiple Tags Test
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from test.paths.both.get import Both
+from test.paths.tag1.get import Tag1
+
+
+class Tag1Api(
+    Both,
+    Tag1,
+):
+    \\"\\"\\"NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    \\"\\"\\"
+    pass
+",
+  "test/apis/tags/tag2_api.py": "# coding: utf-8
+
+\\"\\"\\"
+    Multiple Tags Test
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from test.paths.tag2.get import Tag2
+
+
+class Tag2Api(
+    Tag2,
+):
+    \\"\\"\\"NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    \\"\\"\\"
+    pass
+",
+  "test/configuration.py": "# coding: utf-8
+
+\\"\\"\\"
+    Multiple Tags Test
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+import copy
+import logging
+import multiprocessing
+import sys
+import urllib3
+
+from http import client as http_client
+from test.exceptions import ApiValueError
+
+
+JSON_SCHEMA_VALIDATION_KEYWORDS = {
+    'multipleOf', 'maximum', 'exclusiveMaximum',
+    'minimum', 'exclusiveMinimum', 'maxLength',
+    'minLength', 'pattern', 'maxItems', 'minItems',
+    'uniqueItems', 'maxProperties', 'minProperties',
+}
+
+class Configuration(object):
+    \\"\\"\\"NOTE: This class is auto generated by OpenAPI Generator
+
+    Ref: https://openapi-generator.tech
+    Do not edit the class manually.
+
+    :param host: Base url
+    :param api_key: Dict to store API key(s).
+      Each entry in the dict specifies an API key.
+      The dict key is the name of the security scheme in the OAS specification.
+      The dict value is the API key secret.
+    :param api_key_prefix: Dict to store API prefix (e.g. Bearer)
+      The dict key is the name of the security scheme in the OAS specification.
+      The dict value is an API key prefix when generating the auth data.
+    :param username: Username for HTTP basic authentication
+    :param password: Password for HTTP basic authentication
+    :param discard_unknown_keys: Boolean value indicating whether to discard
+      unknown properties. A server may send a response that includes additional
+      properties that are not known by the client in the following scenarios:
+      1. The OpenAPI document is incomplete, i.e. it does not match the server
+         implementation.
+      2. The client was generated using an older version of the OpenAPI document
+         and the server has been upgraded since then.
+      If a schema in the OpenAPI document defines the additionalProperties attribute,
+      then all undeclared properties received by the server are injected into the
+      additional properties map. In that case, there are undeclared properties, and
+      nothing to discard.
+    :param disabled_client_side_validations (string): Comma-separated list of
+      JSON schema validation keywords to disable JSON schema structural validation
+      rules. The following keywords may be specified: multipleOf, maximum,
+      exclusiveMaximum, minimum, exclusiveMinimum, maxLength, minLength, pattern,
+      maxItems, minItems.
+      By default, the validation is performed for data generated locally by the client
+      and data received from the server, independent of any validation performed by
+      the server side. If the input data does not satisfy the JSON schema validation
+      rules specified in the OpenAPI document, an exception is raised.
+      If disabled_client_side_validations is set, structural validation is
+      disabled. This can be useful to troubleshoot data validation problem, such as
+      when the OpenAPI document validation rules do not match the actual API data
+      received by the server.
+    :param server_index: Index to servers configuration.
+    :param server_variables: Mapping with string values to replace variables in
+      templated server configuration. The validation of enums is performed for
+      variables with defined enum values before.
+    :param server_operation_index: Mapping from operation ID to an index to server
+      configuration.
+    :param server_operation_variables: Mapping from operation ID to a mapping with
+      string values to replace variables in templated server configuration.
+      The validation of enums is performed for variables with defined enum values before.
+
+    \\"\\"\\"
+
+    _default = None
+
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
+        \\"\\"\\"Constructor
+        \\"\\"\\"
+        self._base_path = \\"http://localhost\\" if host is None else host
+        \\"\\"\\"Default Base url
+        \\"\\"\\"
+        self.server_index = 0 if server_index is None and host is None else server_index
+        self.server_operation_index = server_operation_index or {}
+        \\"\\"\\"Default server index
+        \\"\\"\\"
+        self.server_variables = server_variables or {}
+        self.server_operation_variables = server_operation_variables or {}
+        \\"\\"\\"Default server variables
+        \\"\\"\\"
+        self.temp_folder_path = None
+        \\"\\"\\"Temp file folder for downloading files
+        \\"\\"\\"
+        # Authentication Settings
+        self.disabled_client_side_validations = disabled_client_side_validations
+        self.logger = {}
+        \\"\\"\\"Logging Settings
+        \\"\\"\\"
+        self.logger[\\"package_logger\\"] = logging.getLogger(\\"test\\")
+        self.logger[\\"urllib3_logger\\"] = logging.getLogger(\\"urllib3\\")
+        self.logger_format = '%(asctime)s %(levelname)s %(message)s'
+        \\"\\"\\"Log format
+        \\"\\"\\"
+        self.logger_stream_handler = None
+        \\"\\"\\"Log stream handler
+        \\"\\"\\"
+        self.logger_file_handler = None
+        \\"\\"\\"Log file handler
+        \\"\\"\\"
+        self.logger_file = None
+        \\"\\"\\"Debug file location
+        \\"\\"\\"
+        self.debug = False
+        \\"\\"\\"Debug switch
+        \\"\\"\\"
+
+        self.verify_ssl = True
+        \\"\\"\\"SSL/TLS verification
+           Set this to false to skip verifying SSL certificate when calling API
+           from https server.
+        \\"\\"\\"
+        self.ssl_ca_cert = None
+        \\"\\"\\"Set this to customize the certificate file to verify the peer.
+        \\"\\"\\"
+        self.cert_file = None
+        \\"\\"\\"client certificate file
+        \\"\\"\\"
+        self.key_file = None
+        \\"\\"\\"client key file
+        \\"\\"\\"
+        self.assert_hostname = None
+        \\"\\"\\"Set this to True/False to enable/disable SSL hostname verification.
+        \\"\\"\\"
+
+        self.connection_pool_maxsize = multiprocessing.cpu_count() * 5
+        \\"\\"\\"urllib3 connection pool's maximum number of connections saved
+           per pool. urllib3 uses 1 connection as default value, but this is
+           not the best value when you are making a lot of possibly parallel
+           requests to the same host, which is often the case here.
+           cpu_count * 5 is used as default value to increase performance.
+        \\"\\"\\"
+
+        self.proxy = None
+        \\"\\"\\"Proxy URL
+        \\"\\"\\"
+        self.proxy_headers = None
+        \\"\\"\\"Proxy headers
+        \\"\\"\\"
+        self.safe_chars_for_path_param = ''
+        \\"\\"\\"Safe chars for path_param
+        \\"\\"\\"
+        self.retries = None
+        \\"\\"\\"Adding retries to override urllib3 default value 3
+        \\"\\"\\"
+        # Enable client side validation
+        self.client_side_validation = True
+
+        # Options to pass down to the underlying urllib3 socket
+        self.socket_options = None
+
+    def __deepcopy__(self, memo):
+        cls = self.__class__
+        result = cls.__new__(cls)
+        memo[id(self)] = result
+        for k, v in self.__dict__.items():
+            if k not in ('logger', 'logger_file_handler'):
+                setattr(result, k, copy.deepcopy(v, memo))
+        # shallow copy of loggers
+        result.logger = copy.copy(self.logger)
+        # use setters to configure loggers
+        result.logger_file = self.logger_file
+        result.debug = self.debug
+        return result
+
+    def __setattr__(self, name, value):
+        object.__setattr__(self, name, value)
+        if name == 'disabled_client_side_validations':
+            s = set(filter(None, value.split(',')))
+            for v in s:
+                if v not in JSON_SCHEMA_VALIDATION_KEYWORDS:
+                    raise ApiValueError(
+                        \\"Invalid keyword: '{0}''\\".format(v))
+            self._disabled_client_side_validations = s
+
+    @classmethod
+    def set_default(cls, default):
+        \\"\\"\\"Set default instance of configuration.
+
+        It stores default configuration, which can be
+        returned by get_default_copy method.
+
+        :param default: object of Configuration
+        \\"\\"\\"
+        cls._default = copy.deepcopy(default)
+
+    @classmethod
+    def get_default_copy(cls):
+        \\"\\"\\"Return new instance of configuration.
+
+        This method returns newly created, based on default constructor,
+        object of Configuration class or returns a copy of default
+        configuration passed by the set_default method.
+
+        :return: The configuration object.
+        \\"\\"\\"
+        if cls._default is not None:
+            return copy.deepcopy(cls._default)
+        return Configuration()
+
+    @property
+    def logger_file(self):
+        \\"\\"\\"The logger file.
+
+        If the logger_file is None, then add stream handler and remove file
+        handler. Otherwise, add file handler and remove stream handler.
+
+        :param value: The logger_file path.
+        :type: str
+        \\"\\"\\"
+        return self.__logger_file
+
+    @logger_file.setter
+    def logger_file(self, value):
+        \\"\\"\\"The logger file.
+
+        If the logger_file is None, then add stream handler and remove file
+        handler. Otherwise, add file handler and remove stream handler.
+
+        :param value: The logger_file path.
+        :type: str
+        \\"\\"\\"
+        self.__logger_file = value
+        if self.__logger_file:
+            # If set logging file,
+            # then add file handler and remove stream handler.
+            self.logger_file_handler = logging.FileHandler(self.__logger_file)
+            self.logger_file_handler.setFormatter(self.logger_formatter)
+            for _, logger in self.logger.items():
+                logger.addHandler(self.logger_file_handler)
+
+    @property
+    def debug(self):
+        \\"\\"\\"Debug status
+
+        :param value: The debug status, True or False.
+        :type: bool
+        \\"\\"\\"
+        return self.__debug
+
+    @debug.setter
+    def debug(self, value):
+        \\"\\"\\"Debug status
+
+        :param value: The debug status, True or False.
+        :type: bool
+        \\"\\"\\"
+        self.__debug = value
+        if self.__debug:
+            # if debug status is True, turn on debug logging
+            for _, logger in self.logger.items():
+                logger.setLevel(logging.DEBUG)
+            # turn on http_client debug
+            http_client.HTTPConnection.debuglevel = 1
+        else:
+            # if debug status is False, turn off debug logging,
+            # setting log level to default \`logging.WARNING\`
+            for _, logger in self.logger.items():
+                logger.setLevel(logging.WARNING)
+            # turn off http_client debug
+            http_client.HTTPConnection.debuglevel = 0
+
+    @property
+    def logger_format(self):
+        \\"\\"\\"The logger format.
+
+        The logger_formatter will be updated when sets logger_format.
+
+        :param value: The format string.
+        :type: str
+        \\"\\"\\"
+        return self.__logger_format
+
+    @logger_format.setter
+    def logger_format(self, value):
+        \\"\\"\\"The logger format.
+
+        The logger_formatter will be updated when sets logger_format.
+
+        :param value: The format string.
+        :type: str
+        \\"\\"\\"
+        self.__logger_format = value
+        self.logger_formatter = logging.Formatter(self.__logger_format)
+
+    def get_api_key_with_prefix(self, identifier, alias=None):
+        \\"\\"\\"Gets API key (with prefix if set).
+
+        :param identifier: The identifier of apiKey.
+        :param alias: The alternative identifier of apiKey.
+        :return: The token for api key authentication.
+        \\"\\"\\"
+        if self.refresh_api_key_hook is not None:
+            self.refresh_api_key_hook(self)
+        key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
+        if key:
+            prefix = self.api_key_prefix.get(identifier)
+            if prefix:
+                return \\"%s %s\\" % (prefix, key)
+            else:
+                return key
+
+    def get_basic_auth_token(self):
+        \\"\\"\\"Gets HTTP basic authentication header (string).
+
+        :return: The token for basic HTTP authentication.
+        \\"\\"\\"
+        username = \\"\\"
+        if self.username is not None:
+            username = self.username
+        password = \\"\\"
+        if self.password is not None:
+            password = self.password
+        return urllib3.util.make_headers(
+            basic_auth=username + ':' + password
+        ).get('authorization')
+
+    def auth_settings(self):
+        \\"\\"\\"Gets Auth Settings dict for api client.
+
+        :return: The Auth Settings information dict.
+        \\"\\"\\"
+        auth = {}
+        return auth
+
+    def to_debug_report(self):
+        \\"\\"\\"Gets the essential information for debugging.
+
+        :return: The report for debugging.
+        \\"\\"\\"
+        return \\"Python SDK Debug Report:\\\\n\\"\\\\
+               \\"OS: {env}\\\\n\\"\\\\
+               \\"Python Version: {pyversion}\\\\n\\"\\\\
+               \\"Version of the API: 1.0.0\\\\n\\"\\\\
+               \\"SDK Package Version: 1.0.0\\".\\\\
+               format(env=sys.platform, pyversion=sys.version)
+
+    def get_host_settings(self):
+        \\"\\"\\"Gets an array of host settings
+
+        :return: An array of host settings
+        \\"\\"\\"
+        return [
+            {
+                'url': \\"\\",
+                'description': \\"No description provided\\",
+            }
+        ]
+
+    def get_host_from_settings(self, index, variables=None, servers=None):
+        \\"\\"\\"Gets host URL based on the index and variables
+        :param index: array index of the host settings
+        :param variables: hash of variable and the corresponding value
+        :param servers: an array of host settings or None
+        :return: URL based on host settings
+        \\"\\"\\"
+        if index is None:
+            return self._base_path
+
+        variables = {} if variables is None else variables
+        servers = self.get_host_settings() if servers is None else servers
+
+        try:
+            server = servers[index]
+        except IndexError:
+            raise ValueError(
+                \\"Invalid index {0} when selecting the host settings. \\"
+                \\"Must be less than {1}\\".format(index, len(servers)))
+
+        url = server['url']
+
+        # go through variables and replace placeholders
+        for variable_name, variable in server.get('variables', {}).items():
+            used_value = variables.get(
+                variable_name, variable['default_value'])
+
+            if 'enum_values' in variable \\\\
+                    and used_value not in variable['enum_values']:
+                raise ValueError(
+                    \\"The variable \`{0}\` in the host URL has invalid value \\"
+                    \\"{1}. Must be {2}.\\".format(
+                        variable_name, variables[variable_name],
+                        variable['enum_values']))
+
+            url = url.replace(\\"{\\" + variable_name + \\"}\\", used_value)
+
+        return url
+
+    @property
+    def host(self):
+        \\"\\"\\"Return generated host.\\"\\"\\"
+        return self.get_host_from_settings(self.server_index, variables=self.server_variables)
+
+    @host.setter
+    def host(self, value):
+        \\"\\"\\"Fix base path.\\"\\"\\"
+        self._base_path = value
+        self.server_index = None
+",
+  "test/example.py": "def hello(name: str) -> str:
+    \\"\\"\\"A simple greeting.
+    Args:
+        name (str): Name to greet.
+    Returns:
+        str: greeting message
+    \\"\\"\\"
+    return f\\"Hello {name}!\\"
+",
+  "test/exceptions.py": "# coding: utf-8
+
+\\"\\"\\"
+    Multiple Tags Test
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
+
+
+class OpenApiException(Exception):
+    \\"\\"\\"The base exception class for all OpenAPIExceptions\\"\\"\\"
+
+
+class ApiTypeError(OpenApiException, TypeError):
+    def __init__(self, msg, path_to_item=None, valid_classes=None,
+                 key_type=None):
+        \\"\\"\\" Raises an exception for TypeErrors
+
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (list): a list of keys an indices to get to the
+                                 current_item
+                                 None if unset
+            valid_classes (tuple): the primitive classes that current item
+                                   should be an instance of
+                                   None if unset
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a list
+                             None if unset
+        \\"\\"\\"
+        self.path_to_item = path_to_item
+        self.valid_classes = valid_classes
+        self.key_type = key_type
+        full_msg = msg
+        if path_to_item:
+            full_msg = \\"{0} at {1}\\".format(msg, render_path(path_to_item))
+        super(ApiTypeError, self).__init__(full_msg)
+
+
+class ApiValueError(OpenApiException, ValueError):
+    def __init__(self, msg, path_to_item=None):
+        \\"\\"\\"
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (list) the path to the exception in the
+                received_data dict. None if unset
+        \\"\\"\\"
+
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = \\"{0} at {1}\\".format(msg, render_path(path_to_item))
+        super(ApiValueError, self).__init__(full_msg)
+
+
+class ApiAttributeError(OpenApiException, AttributeError):
+    def __init__(self, msg, path_to_item=None):
+        \\"\\"\\"
+        Raised when an attribute reference or assignment fails.
+
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (None/list) the path to the exception in the
+                received_data dict
+        \\"\\"\\"
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = \\"{0} at {1}\\".format(msg, render_path(path_to_item))
+        super(ApiAttributeError, self).__init__(full_msg)
+
+
+class ApiKeyError(OpenApiException, KeyError):
+    def __init__(self, msg, path_to_item=None):
+        \\"\\"\\"
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (None/list) the path to the exception in the
+                received_data dict
+        \\"\\"\\"
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = \\"{0} at {1}\\".format(msg, render_path(path_to_item))
+        super(ApiKeyError, self).__init__(full_msg)
+
+
+T = typing.TypeVar(\\"T\\")
+
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
+
+    def __str__(self):
+        \\"\\"\\"Custom error messages for exception\\"\\"\\"
+        error_message = \\"({0})\\\\n\\"\\\\
+                        \\"Reason: {1}\\\\n\\".format(self.status, self.reason)
+        if self.headers:
+            error_message += \\"HTTP response headers: {0}\\\\n\\".format(
+                self.headers)
+
+        if self.body:
+            error_message += \\"HTTP response body: {0}\\\\n\\".format(self.body)
+
+        return error_message
+
+
+def render_path(path_to_item):
+    \\"\\"\\"Returns a string representation of a path\\"\\"\\"
+    result = \\"\\"
+    for pth in path_to_item:
+        if isinstance(pth, int):
+            result += \\"[{0}]\\".format(pth)
+        else:
+            result += \\"['{0}']\\".format(pth)
+    return result
+",
+  "test/model/__init__.py": "# we can not import model classes here because that would create a circular
+# reference which would not work in python2
+# do not import all models into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all models from one package, import them with
+# from test.models import ModelA, ModelB
+",
+  "test/models/__init__.py": "# coding: utf-8
+
+# flake8: noqa
+
+# import all models into this package
+# if you have many models here with many references from one model to another this may
+# raise a RecursionError
+# to avoid this, import only the models that you directly need like:
+# from test.model.pet import Pet
+# or import this package, but before doing it, use:
+# import sys
+# sys.setrecursionlimit(n)
+
+",
+  "test/paths/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all endpoints from this module, import them with
+# from test.apis.path_to_api import path_to_api
+
+import enum
+
+
+class PathValues(str, enum.Enum):
+    TAG1 = \\"/tag1\\"
+    TAG2 = \\"/tag2\\"
+    BOTH = \\"/both\\"
+    NEITHER = \\"/neither\\"
+",
+  "test/paths/both/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all endpoints from this module, import them with
+# from test.paths.both import Api
+
+from test.paths import PathValues
+
+path = PathValues.BOTH",
+  "test/paths/both/get.py": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+
+from test import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test import schemas  # noqa: F401
+
+from . import path
+
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+_status_code_to_response = {
+    '200': _response_for_200,
+}
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _both_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _both_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _both_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _both_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        used_path = path.value
+        # TODO add cookie handling
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class Both(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def both(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def both(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def both(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def both(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._both_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._both_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "test/paths/both/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+
+from test import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test import schemas  # noqa: F401
+
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _both_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _both_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _both_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _both_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        used_path = path.value
+        # TODO add cookie handling
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class Both(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def both(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def both(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def both(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def both(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._both_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._both_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "test/paths/neither/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all endpoints from this module, import them with
+# from test.paths.neither import Api
+
+from test.paths import PathValues
+
+path = PathValues.NEITHER",
+  "test/paths/neither/get.py": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+
+from test import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test import schemas  # noqa: F401
+
+from . import path
+
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+_status_code_to_response = {
+    '200': _response_for_200,
+}
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _neither_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        used_path = path.value
+        # TODO add cookie handling
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class Neither(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def neither(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def neither(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def neither(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def neither(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._neither_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._neither_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "test/paths/neither/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+
+from test import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test import schemas  # noqa: F401
+
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _neither_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        used_path = path.value
+        # TODO add cookie handling
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class Neither(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def neither(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def neither(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def neither(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def neither(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._neither_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._neither_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "test/paths/tag1/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all endpoints from this module, import them with
+# from test.paths.tag1 import Api
+
+from test.paths import PathValues
+
+path = PathValues.TAG1",
+  "test/paths/tag1/get.py": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+
+from test import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test import schemas  # noqa: F401
+
+from . import path
+
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+_status_code_to_response = {
+    '200': _response_for_200,
+}
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _tag1_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        used_path = path.value
+        # TODO add cookie handling
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class Tag1(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def tag1(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def tag1(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def tag1(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def tag1(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._tag1_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._tag1_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "test/paths/tag1/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+
+from test import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test import schemas  # noqa: F401
+
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _tag1_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        used_path = path.value
+        # TODO add cookie handling
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class Tag1(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def tag1(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def tag1(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def tag1(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def tag1(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._tag1_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._tag1_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "test/paths/tag2/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all endpoints from this module, import them with
+# from test.paths.tag2 import Api
+
+from test.paths import PathValues
+
+path = PathValues.TAG2",
+  "test/paths/tag2/get.py": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+
+from test import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test import schemas  # noqa: F401
+
+from . import path
+
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+_status_code_to_response = {
+    '200': _response_for_200,
+}
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _tag2_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        used_path = path.value
+        # TODO add cookie handling
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class Tag2(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def tag2(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def tag2(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def tag2(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def tag2(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._tag2_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._tag2_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "test/paths/tag2/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+
+from test import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test import schemas  # noqa: F401
+
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _tag2_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        used_path = path.value
+        # TODO add cookie handling
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class Tag2(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def tag2(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def tag2(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def tag2(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def tag2(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._tag2_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._tag2_oapg(
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "test/rest.py": "# coding: utf-8
+
+\\"\\"\\"
+    Multiple Tags Test
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+import logging
+import ssl
+from urllib.parse import urlencode
+import typing
+
+import certifi
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+
+from test.exceptions import ApiException, ApiValueError
+
+
+logger = logging.getLogger(__name__)
+
+
+class RESTClientObject(object):
+
+    def __init__(self, configuration, pools_size=4, maxsize=None):
+        # urllib3.PoolManager will pass all kw parameters to connectionpool
+        # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75  # noqa: E501
+        # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/connectionpool.py#L680  # noqa: E501
+        # maxsize is the number of requests to host that are allowed in parallel  # noqa: E501
+        # Custom SSL certificates and client certificates: http://urllib3.readthedocs.io/en/latest/advanced-usage.html  # noqa: E501
+
+        # cert_reqs
+        if configuration.verify_ssl:
+            cert_reqs = ssl.CERT_REQUIRED
+        else:
+            cert_reqs = ssl.CERT_NONE
+
+        # ca_certs
+        if configuration.ssl_ca_cert:
+            ca_certs = configuration.ssl_ca_cert
+        else:
+            # if not set certificate file, use Mozilla's root certificates.
+            ca_certs = certifi.where()
+
+        addition_pool_args = {}
+        if configuration.assert_hostname is not None:
+            addition_pool_args['assert_hostname'] = configuration.assert_hostname  # noqa: E501
+
+        if configuration.retries is not None:
+            addition_pool_args['retries'] = configuration.retries
+
+        if configuration.socket_options is not None:
+            addition_pool_args['socket_options'] = configuration.socket_options
+
+        if maxsize is None:
+            if configuration.connection_pool_maxsize is not None:
+                maxsize = configuration.connection_pool_maxsize
+            else:
+                maxsize = 4
+
+        # https pool manager
+        if configuration.proxy:
+            self.pool_manager = urllib3.ProxyManager(
+                num_pools=pools_size,
+                maxsize=maxsize,
+                cert_reqs=cert_reqs,
+                ca_certs=ca_certs,
+                cert_file=configuration.cert_file,
+                key_file=configuration.key_file,
+                proxy_url=configuration.proxy,
+                proxy_headers=configuration.proxy_headers,
+                **addition_pool_args
+            )
+        else:
+            self.pool_manager = urllib3.PoolManager(
+                num_pools=pools_size,
+                maxsize=maxsize,
+                cert_reqs=cert_reqs,
+                ca_certs=ca_certs,
+                cert_file=configuration.cert_file,
+                key_file=configuration.key_file,
+                **addition_pool_args
+            )
+
+    def request(
+        self,
+        method: str,
+        url: str,
+        headers: typing.Optional[HTTPHeaderDict] = None,
+        fields: typing.Optional[typing.Tuple[typing.Tuple[str, typing.Any], ...]] = None,
+        body: typing.Optional[typing.Union[str, bytes]] = None,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> urllib3.HTTPResponse:
+        \\"\\"\\"Perform requests.
+
+        :param method: http request method
+        :param url: http request url
+        :param headers: http request headers
+        :param body: request body, for other types
+        :param fields: request parameters for
+                                \`application/x-www-form-urlencoded\`
+                                or \`multipart/form-data\`
+        :param stream: if True, the urllib3.HTTPResponse object will
+                                be returned without reading/decoding response
+                                data. Default is False.
+        :param timeout: timeout setting for this request. If one
+                                number provided, it will be total request
+                                timeout. It can also be a pair (tuple) of
+                                (connection, read) timeouts.
+        \\"\\"\\"
+        method = method.upper()
+        assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT',
+                          'PATCH', 'OPTIONS']
+
+        if fields and body:
+            raise ApiValueError(
+                \\"body parameter cannot be used with fields parameter.\\"
+            )
+
+        fields = fields or {}
+        headers = headers or {}
+
+        if timeout:
+            if isinstance(timeout, (int, float)):  # noqa: E501,F821
+                timeout = urllib3.Timeout(total=timeout)
+            elif (isinstance(timeout, tuple) and
+                  len(timeout) == 2):
+                timeout = urllib3.Timeout(connect=timeout[0], read=timeout[1])
+
+        try:
+            # For \`POST\`, \`PUT\`, \`PATCH\`, \`OPTIONS\`, \`DELETE\`
+            if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
+                if 'Content-Type' not in headers and body is None:
+                    r = self.pool_manager.request(
+                        method,
+                        url,
+                        preload_content=not stream,
+                        timeout=timeout,
+                        headers=headers
+                    )
+                elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
+                    r = self.pool_manager.request(
+                        method, url,
+                        body=body,
+                        fields=fields,
+                        encode_multipart=False,
+                        preload_content=not stream,
+                        timeout=timeout,
+                        headers=headers)
+                elif headers['Content-Type'] == 'multipart/form-data':
+                    # must del headers['Content-Type'], or the correct
+                    # Content-Type which generated by urllib3 will be
+                    # overwritten.
+                    del headers['Content-Type']
+                    r = self.pool_manager.request(
+                        method, url,
+                        fields=fields,
+                        encode_multipart=True,
+                        preload_content=not stream,
+                        timeout=timeout,
+                        headers=headers)
+                # Pass a \`string\` parameter directly in the body to support
+                # other content types than Json when \`body\` argument is
+                # provided in serialized form
+                elif isinstance(body, str) or isinstance(body, bytes):
+                    request_body = body
+                    r = self.pool_manager.request(
+                        method, url,
+                        body=request_body,
+                        preload_content=not stream,
+                        timeout=timeout,
+                        headers=headers)
+                else:
+                    # Cannot generate the request from given parameters
+                    msg = \\"\\"\\"Cannot prepare a request message for provided
+                             arguments. Please check that your arguments match
+                             declared content type.\\"\\"\\"
+                    raise ApiException(status=0, reason=msg)
+            # For \`GET\`, \`HEAD\`
+            else:
+                r = self.pool_manager.request(method, url,
+                                              preload_content=not stream,
+                                              timeout=timeout,
+                                              headers=headers)
+        except urllib3.exceptions.SSLError as e:
+            msg = \\"{0}\\\\n{1}\\".format(type(e).__name__, str(e))
+            raise ApiException(status=0, reason=msg)
+
+        if not stream:
+            # log response body
+            logger.debug(\\"response body: %s\\", r.data)
+
+        return r
+
+    def GET(self, url, headers=None, stream=False,
+            timeout=None, fields=None) -> urllib3.HTTPResponse:
+        return self.request(\\"GET\\", url,
+                            headers=headers,
+                            stream=stream,
+                            timeout=timeout,
+                            fields=fields)
+
+    def HEAD(self, url, headers=None, stream=False,
+             timeout=None, fields=None) -> urllib3.HTTPResponse:
+        return self.request(\\"HEAD\\", url,
+                            headers=headers,
+                            stream=stream,
+                            timeout=timeout,
+                            fields=fields)
+
+    def OPTIONS(self, url, headers=None,
+                body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
+        return self.request(\\"OPTIONS\\", url,
+                            headers=headers,
+                            stream=stream,
+                            timeout=timeout,
+                            body=body, fields=fields)
+
+    def DELETE(self, url, headers=None, body=None,
+               stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
+        return self.request(\\"DELETE\\", url,
+                            headers=headers,
+                            stream=stream,
+                            timeout=timeout,
+                            body=body, fields=fields)
+
+    def POST(self, url, headers=None,
+             body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
+        return self.request(\\"POST\\", url,
+                            headers=headers,
+                            stream=stream,
+                            timeout=timeout,
+                            body=body, fields=fields)
+
+    def PUT(self, url, headers=None,
+            body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
+        return self.request(\\"PUT\\", url,
+                            headers=headers,
+                            stream=stream,
+                            timeout=timeout,
+                            body=body, fields=fields)
+
+    def PATCH(self, url, headers=None,
+              body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
+        return self.request(\\"PATCH\\", url,
+                            headers=headers,
+                            stream=stream,
+                            timeout=timeout,
+                            body=body, fields=fields)
+",
+  "test/schemas.py": "# coding: utf-8
+
+\\"\\"\\"
+    Multiple Tags Test
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from collections import defaultdict
+from datetime import date, datetime, timedelta  # noqa: F401
+import functools
+import decimal
+import io
+import re
+import types
+import typing
+import uuid
+
+from dateutil.parser.isoparser import isoparser, _takes_ascii
+import frozendict
+
+from test.exceptions import (
+    ApiTypeError,
+    ApiValueError,
+)
+from test.configuration import (
+    Configuration,
+)
+
+
+class Unset(object):
+    \\"\\"\\"
+    An instance of this class is set as the default value for object type(dict) properties that are optional
+    When a property has an unset value, that property will not be assigned in the dict
+    \\"\\"\\"
+    pass
+
+unset = Unset()
+
+none_type = type(None)
+file_type = io.IOBase
+
+
+class FileIO(io.FileIO):
+    \\"\\"\\"
+    A class for storing files
+    Note: this class is not immutable
+    \\"\\"\\"
+
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
+                raise ApiValueError('Invalid file state; file is closed and must be open')
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
+            return inst
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
+
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        pass
+
+
+def update(d: dict, u: dict):
+    \\"\\"\\"
+    Adds u to d
+    Where each dict is defaultdict(set)
+    \\"\\"\\"
+    if not u:
+        return d
+    for k, v in u.items():
+        if k not in d:
+            d[k] = v
+        else:
+            d[k] = d[k] | v
+
+
+class ValidationMetadata(frozendict.frozendict):
+    \\"\\"\\"
+    A class storing metadata that is needed to validate OpenApi Schema payloads
+    \\"\\"\\"
+    def __new__(
+        cls,
+        path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']),
+        from_server: bool = False,
+        configuration: typing.Optional[Configuration] = None,
+        seen_classes: typing.FrozenSet[typing.Type] = frozenset(),
+        validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]] = frozendict.frozendict()
+    ):
+        \\"\\"\\"
+        Args:
+            path_to_item: the path to the current data being instantiated.
+                For {'a': [1]} if the code is handling, 1, then the path is ('args[0]', 'a', 0)
+                This changes from location to location
+            from_server: whether or not this data came form the server
+                True when receiving server data
+                False when instantiating model with client side data not form the server
+                This does not change from location to location
+            configuration: the Configuration instance to use
+                This is needed because in Configuration:
+                - one can disable validation checking
+                This does not change from location to location
+            seen_classes: when deserializing data that matches multiple schemas, this is used to store
+                the schemas that have been traversed. This is used to stop processing when a cycle is seen.
+                This changes from location to location
+            validated_path_to_schemas: stores the already validated schema classes for a given path location
+                This does not change from location to location
+        \\"\\"\\"
+        return super().__new__(
+            cls,
+            path_to_item=path_to_item,
+            from_server=from_server,
+            configuration=configuration,
+            seen_classes=seen_classes,
+            validated_path_to_schemas=validated_path_to_schemas
+        )
+
+    def validation_ran_earlier(self, cls: type) -> bool:
+        validated_schemas = self.validated_path_to_schemas.get(self.path_to_item, set())
+        validation_ran_earlier = validated_schemas and cls in validated_schemas
+        if validation_ran_earlier:
+            return True
+        if cls in self.seen_classes:
+            return True
+        return False
+
+    @property
+    def path_to_item(self) -> typing.Tuple[typing.Union[str, int], ...]:
+        return self.get('path_to_item')
+
+    @property
+    def from_server(self) -> bool:
+        return self.get('from_server')
+
+    @property
+    def configuration(self) -> typing.Optional[Configuration]:
+        return self.get('configuration')
+
+    @property
+    def seen_classes(self) -> typing.FrozenSet[typing.Type]:
+        return self.get('seen_classes')
+
+    @property
+    def validated_path_to_schemas(self) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]]:
+        return self.get('validated_path_to_schemas')
+
+
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
+class Singleton:
+    \\"\\"\\"
+    Enums and singletons are the same
+    The same instance is returned for a given key of (cls, _arg)
+    \\"\\"\\"
+    _instances = {}
+
+    def __new__(cls, _arg: typing.Any, **kwargs):
+        \\"\\"\\"
+        cls base classes: BoolClass, NoneClass, str, decimal.Decimal
+        The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
+        However 1.0  can also be ingested into that enum schema because 1.0 == 1 and
+        Decimal('1.0') == Decimal('1')
+        But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
+        and json serializing that instance would be '1' rather than the expected '1.0'
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        \\"\\"\\"
+        key = (cls, _arg, str(_arg))
+        if key not in cls._instances:
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
+                inst = super().__new__(cls)
+                cls._instances[key] = inst
+            else:
+                cls._instances[key] = super().__new__(cls, _arg)
+        return cls._instances[key]
+
+    def __repr__(self):
+        if isinstance(self, NoneClass):
+            return f'<{self.__class__.__name__}: None>'
+        elif isinstance(self, BoolClass):
+            if bool(self):
+                return f'<{self.__class__.__name__}: True>'
+            return f'<{self.__class__.__name__}: False>'
+        return f'<{self.__class__.__name__}: {super().__repr__()}>'
+
+
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
+class NoneClass(Singleton):
+    @classproperty
+    def NONE(cls):
+        return cls(None)
+
+    def __bool__(self) -> bool:
+        return False
+
+
+class BoolClass(Singleton):
+    @classproperty
+    def TRUE(cls):
+        return cls(True)
+
+    @classproperty
+    def FALSE(cls):
+        return cls(False)
+
+    @functools.lru_cache()
+    def __bool__(self) -> bool:
+        for key, instance in self._instances.items():
+            if self is instance:
+                return bool(key[1])
+        raise ValueError('Unable to find the boolean value of this instance')
+
+
+class MetaOapgTyped:
+    exclusive_maximum: typing.Union[int, float]
+    inclusive_maximum: typing.Union[int, float]
+    exclusive_minimum: typing.Union[int, float]
+    inclusive_minimum: typing.Union[int, float]
+    max_items: int
+    min_items: int
+    discriminator: typing.Dict[str, typing.Dict[str, typing.Type['Schema']]]
+
+
+    class properties:
+        # to hold object properties
+        pass
+
+    additional_properties: typing.Optional[typing.Type['Schema']]
+    max_properties: int
+    min_properties: int
+    all_of: typing.List[typing.Type['Schema']]
+    one_of: typing.List[typing.Type['Schema']]
+    any_of: typing.List[typing.Type['Schema']]
+    not_schema: typing.Type['Schema']
+    max_length: int
+    min_length: int
+    items: typing.Type['Schema']
+
+
+class Schema:
+    \\"\\"\\"
+    the base class of all swagger/openapi schemas/models
+    \\"\\"\\"
+    __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
+    MetaOapg = MetaOapgTyped
+
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
+        \\"\\"\\"
+        Schema _validate_oapg
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
+
+        Returns:
+            path_to_schemas: a map of path to schemas
+
+        Raises:
+            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
+            ApiTypeError: when the input type is not in the list of allowed spec types
+        \\"\\"\\"
+        base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
+        path_to_schemas = {validation_metadata.path_to_item: set()}
+        path_to_schemas[validation_metadata.path_to_item].add(cls)
+        path_to_schemas[validation_metadata.path_to_item].add(base_class)
+        return path_to_schemas
+
+    @staticmethod
+    def _process_schema_classes_oapg(
+        schema_classes: typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]
+    ):
+        \\"\\"\\"
+        Processes and mutates schema_classes
+        If a SomeSchema is a subclass of DictSchema then remove DictSchema because it is already included
+        \\"\\"\\"
+        if len(schema_classes) < 2:
+            return
+        if len(schema_classes) > 2 and UnsetAnyTypeSchema in schema_classes:
+            schema_classes.remove(UnsetAnyTypeSchema)
+        x_schema = schema_type_classes & schema_classes
+        if not x_schema:
+            return
+        x_schema = x_schema.pop()
+        if any(c is not x_schema and issubclass(c, x_schema) for c in schema_classes):
+            # needed to not have a mro error in get_new_class
+            schema_classes.remove(x_schema)
+
+    @classmethod
+    def __get_new_cls(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata
+    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]:
+        \\"\\"\\"
+        Make a new dynamic class and return an instance of that class
+        We are making an instance of cls, but instead of making cls
+        make a new class, new_cls
+        which includes dynamic bases including cls
+        return an instance of that new class
+
+        Dict property + List Item Assignment Use cases:
+        1. value is NOT an instance of the required schema class
+            the value is validated by _validate_oapg
+            _validate_oapg returns a key value pair
+            where the key is the path to the item, and the value will be the required manufactured class
+            made out of the matching schemas
+        2. value is an instance of the correct schema type
+            the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
+            for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
+            and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
+            because value is of the correct type, and validation was run earlier when the instance was created
+        \\"\\"\\"
+        _path_to_schemas = {}
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
+            other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
+            update(_path_to_schemas, other_path_to_schemas)
+        # loop through it make a new class for each entry
+        # do not modify the returned result because it is cached and we would be modifying the cached value
+        path_to_schemas = {}
+        for path, schema_classes in _path_to_schemas.items():
+            \\"\\"\\"
+            Use cases
+            1. N number of schema classes + enum + type != bool/None, classes in path_to_schemas: tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
+                needs Singleton added
+            2. N number of schema classes + enum + type == bool/None, classes in path_to_schemas: BoolClass/NoneClass
+                Singleton already added
+            3. N number of schema classes, classes in path_to_schemas: BoolClass/NoneClass/tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
+            \\"\\"\\"
+            cls._process_schema_classes_oapg(schema_classes)
+            enum_schema = any(
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
+            inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
+            chosen_schema_classes = schema_classes - inheritable_primitive_type
+            suffix = tuple(inheritable_primitive_type)
+            if enum_schema and suffix[0] not in {NoneClass, BoolClass}:
+                suffix = (Singleton,) + suffix
+
+            used_classes = tuple(sorted(chosen_schema_classes, key=lambda a_cls: a_cls.__name__)) + suffix
+            mfg_cls = get_new_class(class_name='DynamicSchema', bases=used_classes)
+            path_to_schemas[path] = mfg_cls
+
+        return path_to_schemas
+
+    @classmethod
+    def _get_new_instance_without_conversion_oapg(
+        cls,
+        arg: typing.Any,
+        path_to_item: typing.Tuple[typing.Union[str, int], ...],
+        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
+    ):
+        # We have a Dynamic class and we are making an instance of it
+        if issubclass(cls, frozendict.frozendict) and issubclass(cls, DictBase):
+            properties = cls._get_properties_oapg(arg, path_to_item, path_to_schemas)
+            return super(Schema, cls).__new__(cls, properties)
+        elif issubclass(cls, tuple) and issubclass(cls, ListBase):
+            items = cls._get_items_oapg(arg, path_to_item, path_to_schemas)
+            return super(Schema, cls).__new__(cls, items)
+        \\"\\"\\"
+        str = openapi str, date, and datetime
+        decimal.Decimal = openapi int and float
+        FileIO = openapi binary type and the user inputs a file
+        bytes = openapi binary type and the user inputs bytes
+        \\"\\"\\"
+        return super(Schema, cls).__new__(cls, arg)
+
+    @classmethod
+    def from_openapi_data_oapg(
+        cls,
+        arg: typing.Union[
+            str,
+            date,
+            datetime,
+            int,
+            float,
+            decimal.Decimal,
+            bool,
+            None,
+            'Schema',
+            dict,
+            frozendict.frozendict,
+            tuple,
+            list,
+            io.FileIO,
+            io.BufferedReader,
+            bytes
+        ],
+        _configuration: typing.Optional[Configuration]
+    ):
+        \\"\\"\\"
+        Schema from_openapi_data_oapg
+        \\"\\"\\"
+        from_server = True
+        validated_path_to_schemas = {}
+        arg = cast_to_allowed_types(arg, from_server, validated_path_to_schemas)
+        validation_metadata = ValidationMetadata(
+            from_server=from_server, configuration=_configuration, validated_path_to_schemas=validated_path_to_schemas)
+        path_to_schemas = cls.__get_new_cls(arg, validation_metadata)
+        new_cls = path_to_schemas[validation_metadata.path_to_item]
+        new_inst = new_cls._get_new_instance_without_conversion_oapg(
+            arg,
+            validation_metadata.path_to_item,
+            path_to_schemas
+        )
+        return new_inst
+
+    @staticmethod
+    def __get_input_dict(*args, **kwargs) -> frozendict.frozendict:
+        input_dict = {}
+        if args and isinstance(args[0], (dict, frozendict.frozendict)):
+            input_dict.update(args[0])
+        if kwargs:
+            input_dict.update(kwargs)
+        return frozendict.frozendict(input_dict)
+
+    @staticmethod
+    def __remove_unsets(kwargs):
+        return {key: val for key, val in kwargs.items() if val is not unset}
+
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+        \\"\\"\\"
+        Schema __new__
+
+        Args:
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
+            _configuration: contains the Configuration that enables json schema validation keywords
+                like minItems, minLength etc
+
+        Note: double underscores are used here because pycharm thinks that these variables
+        are instance properties if they are named normally :(
+        \\"\\"\\"
+        __kwargs = cls.__remove_unsets(kwargs)
+        if not _args and not __kwargs:
+            raise TypeError(
+                'No input given. args or kwargs must be given.'
+            )
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
+        else:
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
+        __from_server = False
+        __validated_path_to_schemas = {}
+        __arg = cast_to_allowed_types(
+            __arg, __from_server, __validated_path_to_schemas)
+        __validation_metadata = ValidationMetadata(
+            configuration=_configuration, from_server=__from_server, validated_path_to_schemas=__validated_path_to_schemas)
+        __path_to_schemas = cls.__get_new_cls(__arg, __validation_metadata)
+        __new_cls = __path_to_schemas[__validation_metadata.path_to_item]
+        return __new_cls._get_new_instance_without_conversion_oapg(
+            __arg,
+            __validation_metadata.path_to_item,
+            __path_to_schemas
+        )
+
+    def __init__(
+        self,
+        *_args: typing.Union[
+            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
+        _configuration: typing.Optional[Configuration] = None,
+        **kwargs: typing.Union[
+            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset
+        ]
+    ):
+        \\"\\"\\"
+        this is needed to fix 'Unexpected argument' warning in pycharm
+        this code does nothing because all Schema instances are immutable
+        this means that all input data is passed into and used in new, and after the new instance is made
+        no new attributes are assigned and init is not used
+        \\"\\"\\"
+        pass
+
+\\"\\"\\"
+import itertools
+data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
+\\"\\"\\"
+if typing.TYPE_CHECKING:
+    # qty 1
+    NoneMixin = NoneClass
+    FrozenDictMixin = frozendict.frozendict
+    TupleMixin = tuple
+    StrMixin = str
+    DecimalMixin = decimal.Decimal
+    BoolMixin = BoolClass
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
+    class BinaryMixin(bytes, FileIO):
+        pass
+    class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
+        pass
+    class NoneTupleMixin(NoneClass, tuple):
+        pass
+    class NoneStrMixin(NoneClass, str):
+        pass
+    class NoneDecimalMixin(NoneClass, decimal.Decimal):
+        pass
+    class NoneBoolMixin(NoneClass, BoolClass):
+        pass
+    class FrozenDictTupleMixin(frozendict.frozendict, tuple):
+        pass
+    class FrozenDictStrMixin(frozendict.frozendict, str):
+        pass
+    class FrozenDictDecimalMixin(frozendict.frozendict, decimal.Decimal):
+        pass
+    class FrozenDictBoolMixin(frozendict.frozendict, BoolClass):
+        pass
+    class TupleStrMixin(tuple, str):
+        pass
+    class TupleDecimalMixin(tuple, decimal.Decimal):
+        pass
+    class TupleBoolMixin(tuple, BoolClass):
+        pass
+    class StrDecimalMixin(str, decimal.Decimal):
+        pass
+    class StrBoolMixin(str, BoolClass):
+        pass
+    class DecimalBoolMixin(decimal.Decimal, BoolClass):
+        pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
+else:
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
+
+
+class ValidatorBase:
+    @staticmethod
+    def _is_json_validation_enabled_oapg(schema_keyword, configuration=None):
+        \\"\\"\\"Returns true if JSON schema validation is enabled for the specified
+        validation keyword. This can be used to skip JSON schema structural validation
+        as requested in the configuration.
+        Note: the suffix _oapg stands for openapi python (experimental) generator and
+        it has been added to prevent collisions with other methods and properties
+
+        Args:
+            schema_keyword (string): the name of a JSON schema validation keyword.
+            configuration (Configuration): the configuration class.
+        \\"\\"\\"
+
+        return (configuration is None or
+            not hasattr(configuration, '_disabled_client_side_validations') or
+            schema_keyword not in configuration._disabled_client_side_validations)
+
+    @staticmethod
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+        raise ApiValueError(
+            \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
+                value=value,
+                constraint_msg=constraint_msg,
+                constraint_value=constraint_value,
+                additional_txt=additional_txt,
+                path_to_item=path_to_item,
+            )
+        )
+
+
+class EnumBase:
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class BoolBase:
+    def is_true_oapg(self) -> bool:
+        \\"\\"\\"
+        A replacement for x is True
+        True if the instance is a BoolClass True Singleton
+        \\"\\"\\"
+        if not issubclass(self.__class__, BoolClass):
+            return False
+        return bool(self)
+
+    def is_false_oapg(self) -> bool:
+        \\"\\"\\"
+        A replacement for x is False
+        True if the instance is a BoolClass False Singleton
+        \\"\\"\\"
+        if not issubclass(self.__class__, BoolClass):
+            return False
+        return bool(self) is False
+
+
+class NoneBase:
+    def is_none_oapg(self) -> bool:
+        \\"\\"\\"
+        A replacement for x is None
+        True if the instance is a NoneClass None Singleton
+        \\"\\"\\"
+        if issubclass(self.__class__, NoneClass):
+            return True
+        return False
+
+
+class StrBase(ValidatorBase):
+    MetaOapg: MetaOapgTyped
+
+    @property
+    def as_str_oapg(self) -> str:
+        return self
+
+    @property
+    def as_date_oapg(self) -> date:
+        raise Exception('not implemented')
+
+    @property
+    def as_datetime_oapg(self) -> datetime:
+        raise Exception('not implemented')
+
+    @property
+    def as_decimal_oapg(self) -> decimal.Decimal:
+        raise Exception('not implemented')
+
+    @property
+    def as_uuid_oapg(self) -> uuid.UUID:
+        raise Exception('not implemented')
+
+    @classmethod
+    def __check_str_validations(
+        cls,
+        arg: str,
+        validation_metadata: ValidationMetadata
+    ):
+        if not hasattr(cls, 'MetaOapg'):
+            return
+        if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'max_length') and
+                len(arg) > cls.MetaOapg.max_length):
+            cls._raise_validation_error_message_oapg(
+                value=arg,
+                constraint_msg=\\"length must be less than or equal to\\",
+                constraint_value=cls.MetaOapg.max_length,
+                path_to_item=validation_metadata.path_to_item
+            )
+
+        if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'min_length') and
+                len(arg) < cls.MetaOapg.min_length):
+            cls._raise_validation_error_message_oapg(
+                value=arg,
+                constraint_msg=\\"length must be greater than or equal to\\",
+                constraint_value=cls.MetaOapg.min_length,
+                path_to_item=validation_metadata.path_to_item
+            )
+
+        if (cls._is_json_validation_enabled_oapg('pattern', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'regex')):
+            for regex_dict in cls.MetaOapg.regex:
+                flags = regex_dict.get('flags', 0)
+                if not re.search(regex_dict['pattern'], arg, flags=flags):
+                    if flags != 0:
+                        # Don't print the regex flags if the flags are not
+                        # specified in the OAS document.
+                        cls._raise_validation_error_message_oapg(
+                            value=arg,
+                            constraint_msg=\\"must match regular expression\\",
+                            constraint_value=regex_dict['pattern'],
+                            path_to_item=validation_metadata.path_to_item,
+                            additional_txt=\\" with flags=\`{}\`\\".format(flags)
+                        )
+                    cls._raise_validation_error_message_oapg(
+                        value=arg,
+                        constraint_msg=\\"must match regular expression\\",
+                        constraint_value=regex_dict['pattern'],
+                        path_to_item=validation_metadata.path_to_item
+                    )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
+        \\"\\"\\"
+        StrBase _validate_oapg
+        Validates that validations pass
+        \\"\\"\\"
+        if isinstance(arg, str):
+            cls.__check_str_validations(arg, validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class UUIDBase:
+    @property
+    @functools.lru_cache()
+    def as_uuid_oapg(self) -> uuid.UUID:
+        return uuid.UUID(self)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
+        if isinstance(arg, str):
+            try:
+                uuid.UUID(arg)
+                return True
+            except ValueError:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type UUID at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: typing.Optional[ValidationMetadata] = None,
+    ):
+        \\"\\"\\"
+        UUIDBase _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class CustomIsoparser(isoparser):
+
+    @_takes_ascii
+    def parse_isodatetime(self, dt_str):
+        components, pos = self._parse_isodate(dt_str)
+        if len(dt_str) > pos:
+            if self._sep is None or dt_str[pos:pos + 1] == self._sep:
+                components += self._parse_isotime(dt_str[pos + 1:])
+            else:
+                raise ValueError('String contains unknown ISO components')
+
+        if len(components) > 3 and components[3] == 24:
+            components[3] = 0
+            return datetime(*components) + timedelta(days=1)
+
+        if len(components) <= 3:
+            raise ValueError('Value is not a datetime')
+
+        return datetime(*components)
+
+    @_takes_ascii
+    def parse_isodate(self, datestr):
+        components, pos = self._parse_isodate(datestr)
+
+        if len(datestr) > pos:
+            raise ValueError('String contains invalid time components')
+
+        if len(components) > 3:
+            raise ValueError('String contains invalid time components')
+
+        return date(*components)
+
+
+DEFAULT_ISOPARSER = CustomIsoparser()
+
+
+class DateBase:
+    @property
+    @functools.lru_cache()
+    def as_date_oapg(self) -> date:
+        return DEFAULT_ISOPARSER.parse_isodate(self)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
+        if isinstance(arg, str):
+            try:
+                DEFAULT_ISOPARSER.parse_isodate(arg)
+                return True
+            except ValueError:
+                raise ApiValueError(
+                    \\"Value does not conform to the required ISO-8601 date format. \\"
+                    \\"Invalid value '{}' for type date at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: typing.Optional[ValidationMetadata] = None,
+    ):
+        \\"\\"\\"
+        DateBase _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class DateTimeBase:
+    @property
+    @functools.lru_cache()
+    def as_datetime_oapg(self) -> datetime:
+        return DEFAULT_ISOPARSER.parse_isodatetime(self)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
+        if isinstance(arg, str):
+            try:
+                DEFAULT_ISOPARSER.parse_isodatetime(arg)
+                return True
+            except ValueError:
+                raise ApiValueError(
+                    \\"Value does not conform to the required ISO-8601 datetime format. \\"
+                    \\"Invalid value '{}' for type datetime at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        DateTimeBase _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class DecimalBase:
+    \\"\\"\\"
+    A class for storing decimals that are sent over the wire as strings
+    These schemas must remain based on StrBase rather than NumberBase
+    because picking base classes must be deterministic
+    \\"\\"\\"
+
+    @property
+    @functools.lru_cache()
+    def as_decimal_oapg(self) -> decimal.Decimal:
+        return decimal.Decimal(self)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
+        if isinstance(arg, str):
+            try:
+                decimal.Decimal(arg)
+                return True
+            except decimal.InvalidOperation:
+                raise ApiValueError(
+                    \\"Value cannot be converted to a decimal. \\"
+                    \\"Invalid value '{}' for type decimal at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        DecimalBase _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class NumberBase(ValidatorBase):
+    MetaOapg: MetaOapgTyped
+
+    @property
+    def as_int_oapg(self) -> int:
+        try:
+            return self._as_int
+        except AttributeError:
+            \\"\\"\\"
+            Note: for some numbers like 9.0 they could be represented as an
+            integer but our code chooses to store them as
+            >>> Decimal('9.0').as_tuple()
+            DecimalTuple(sign=0, digits=(9, 0), exponent=-1)
+            so we can tell that the value came from a float and convert it back to a float
+            during later serialization
+            \\"\\"\\"
+            if self.as_tuple().exponent < 0:
+                # this could be represented as an integer but should be represented as a float
+                # because that's what it was serialized from
+                raise ApiValueError(f'{self} is not an integer')
+            self._as_int = int(self)
+            return self._as_int
+
+    @property
+    def as_float_oapg(self) -> float:
+        try:
+            return self._as_float
+        except AttributeError:
+            if self.as_tuple().exponent >= 0:
+                raise ApiValueError(f'{self} is not a float')
+            self._as_float = float(self)
+            return self._as_float
+
+    @classmethod
+    def __check_numeric_validations(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata
+    ):
+        if not hasattr(cls, 'MetaOapg'):
+            return
+        if cls._is_json_validation_enabled_oapg('multipleOf',
+                                      validation_metadata.configuration) and hasattr(cls.MetaOapg, 'multiple_of'):
+            multiple_of_value = cls.MetaOapg.multiple_of
+            if (not (float(arg) / multiple_of_value).is_integer()):
+                # Note 'multipleOf' will be as good as the floating point arithmetic.
+                cls._raise_validation_error_message_oapg(
+                    value=arg,
+                    constraint_msg=\\"value must be a multiple of\\",
+                    constraint_value=multiple_of_value,
+                    path_to_item=validation_metadata.path_to_item
+                )
+
+        checking_max_or_min_values = any(
+            hasattr(cls.MetaOapg, validation_key) for validation_key in {
+                'exclusive_maximum',
+                'inclusive_maximum',
+                'exclusive_minimum',
+                'inclusive_minimum',
+            }
+        )
+        if not checking_max_or_min_values:
+            return
+
+        if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'exclusive_maximum') and
+                arg >= cls.MetaOapg.exclusive_maximum):
+            cls._raise_validation_error_message_oapg(
+                value=arg,
+                constraint_msg=\\"must be a value less than\\",
+                constraint_value=cls.MetaOapg.exclusive_maximum,
+                path_to_item=validation_metadata.path_to_item
+            )
+
+        if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'inclusive_maximum') and
+                arg > cls.MetaOapg.inclusive_maximum):
+            cls._raise_validation_error_message_oapg(
+                value=arg,
+                constraint_msg=\\"must be a value less than or equal to\\",
+                constraint_value=cls.MetaOapg.inclusive_maximum,
+                path_to_item=validation_metadata.path_to_item
+            )
+
+        if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'exclusive_minimum') and
+                arg <= cls.MetaOapg.exclusive_minimum):
+            cls._raise_validation_error_message_oapg(
+                value=arg,
+                constraint_msg=\\"must be a value greater than\\",
+                constraint_value=cls.MetaOapg.exclusive_maximum,
+                path_to_item=validation_metadata.path_to_item
+            )
+
+        if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'inclusive_minimum') and
+                arg < cls.MetaOapg.inclusive_minimum):
+            cls._raise_validation_error_message_oapg(
+                value=arg,
+                constraint_msg=\\"must be a value greater than or equal to\\",
+                constraint_value=cls.MetaOapg.inclusive_minimum,
+                path_to_item=validation_metadata.path_to_item
+            )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
+        \\"\\"\\"
+        NumberBase _validate_oapg
+        Validates that validations pass
+        \\"\\"\\"
+        if isinstance(arg, decimal.Decimal):
+            cls.__check_numeric_validations(arg, validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class ListBase(ValidatorBase):
+    MetaOapg: MetaOapgTyped
+
+    @classmethod
+    def __validate_items(cls, list_items, validation_metadata: ValidationMetadata):
+        \\"\\"\\"
+        Ensures that:
+        - values passed in for items are valid
+        Exceptions will be raised if:
+        - invalid arguments were passed in
+
+        Args:
+            list_items: the input list of items
+
+        Raises:
+            ApiTypeError - for missing required arguments, or for invalid properties
+        \\"\\"\\"
+
+        # if we have definitions for an items schema, use it
+        # otherwise accept anything
+        item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
+        path_to_schemas = {}
+        for i, value in enumerate(list_items):
+            item_validation_metadata = ValidationMetadata(
+                from_server=validation_metadata.from_server,
+                configuration=validation_metadata.configuration,
+                path_to_item=validation_metadata.path_to_item+(i,),
+                validated_path_to_schemas=validation_metadata.validated_path_to_schemas
+            )
+            if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
+                continue
+            other_path_to_schemas = item_cls._validate_oapg(
+                value, validation_metadata=item_validation_metadata)
+            update(path_to_schemas, other_path_to_schemas)
+        return path_to_schemas
+
+    @classmethod
+    def __check_tuple_validations(
+            cls, arg,
+            validation_metadata: ValidationMetadata):
+        if not hasattr(cls, 'MetaOapg'):
+            return
+        if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'max_items') and
+                len(arg) > cls.MetaOapg.max_items):
+            cls._raise_validation_error_message_oapg(
+                value=arg,
+                constraint_msg=\\"number of items must be less than or equal to\\",
+                constraint_value=cls.MetaOapg.max_items,
+                path_to_item=validation_metadata.path_to_item
+            )
+
+        if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'min_items') and
+                len(arg) < cls.MetaOapg.min_items):
+            cls._raise_validation_error_message_oapg(
+                value=arg,
+                constraint_msg=\\"number of items must be greater than or equal to\\",
+                constraint_value=cls.MetaOapg.min_items,
+                path_to_item=validation_metadata.path_to_item
+            )
+
+        if (cls._is_json_validation_enabled_oapg('uniqueItems', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
+            unique_items = set(arg)
+            if len(arg) > len(unique_items):
+                cls._raise_validation_error_message_oapg(
+                    value=arg,
+                    constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
+                    constraint_value='unique_items==True',
+                    path_to_item=validation_metadata.path_to_item
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        ListBase _validate_oapg
+        We return dynamic classes of different bases depending upon the inputs
+        This makes it so:
+        - the returned instance is always a subclass of our defining schema
+            - this allows us to check type based on whether an instance is a subclass of a schema
+        - the returned instance is a serializable type (except for None, True, and False) which are enums
+
+        Returns:
+            new_cls (type): the new class
+
+        Raises:
+            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
+            ApiTypeError: when the input type is not in the list of allowed spec types
+        \\"\\"\\"
+        if isinstance(arg, tuple):
+            cls.__check_tuple_validations(arg, validation_metadata)
+        _path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
+        if not isinstance(arg, tuple):
+            return _path_to_schemas
+        updated_vm = ValidationMetadata(
+            configuration=validation_metadata.configuration,
+            from_server=validation_metadata.from_server,
+            path_to_item=validation_metadata.path_to_item,
+            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
+            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
+        )
+        other_path_to_schemas = cls.__validate_items(arg, validation_metadata=updated_vm)
+        update(_path_to_schemas, other_path_to_schemas)
+        return _path_to_schemas
+
+    @classmethod
+    def _get_items_oapg(
+        cls: 'Schema',
+        arg: typing.List[typing.Any],
+        path_to_item: typing.Tuple[typing.Union[str, int], ...],
+        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
+    ):
+        '''
+        ListBase _get_items_oapg
+        '''
+        cast_items = []
+
+        for i, value in enumerate(arg):
+            item_path_to_item = path_to_item + (i,)
+            item_cls = path_to_schemas[item_path_to_item]
+            new_value = item_cls._get_new_instance_without_conversion_oapg(
+                value,
+                item_path_to_item,
+                path_to_schemas
+            )
+            cast_items.append(new_value)
+
+        return cast_items
+
+
+class Discriminable:
+    MetaOapg: MetaOapgTyped
+
+    @classmethod
+    def _ensure_discriminator_value_present_oapg(cls, disc_property_name: str, validation_metadata: ValidationMetadata, *args):
+        if not args or args and disc_property_name not in args[0]:
+            # The input data does not contain the discriminator property
+            raise ApiValueError(
+                \\"Cannot deserialize input data due to missing discriminator. \\"
+                \\"The discriminator property '{}' is missing at path: {}\\".format(disc_property_name, validation_metadata.path_to_item)
+            )
+
+    @classmethod
+    def get_discriminated_class_oapg(cls, disc_property_name: str, disc_payload_value: str):
+        \\"\\"\\"
+        Used in schemas with discriminators
+        \\"\\"\\"
+        if not hasattr(cls.MetaOapg, 'discriminator'):
+            return None
+        disc = cls.MetaOapg.discriminator()
+        if disc_property_name not in disc:
+            return None
+        discriminated_cls = disc[disc_property_name].get(disc_payload_value)
+        if discriminated_cls is not None:
+            return discriminated_cls
+        if not hasattr(cls, 'MetaOapg'):
+            return None
+        elif not (
+            hasattr(cls.MetaOapg, 'all_of') or
+            hasattr(cls.MetaOapg, 'one_of') or
+            hasattr(cls.MetaOapg, 'any_of')
+        ):
+            return None
+        # TODO stop traveling if a cycle is hit
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        return None
+
+
+class DictBase(Discriminable, ValidatorBase):
+
+    @classmethod
+    def __validate_arg_presence(cls, arg):
+        \\"\\"\\"
+        Ensures that:
+        - all required arguments are passed in
+        - the input variable names are valid
+            - present in properties or
+            - accepted because additionalProperties exists
+        Exceptions will be raised if:
+        - invalid arguments were passed in
+            - a var_name is invalid if additional_properties == NotAnyTypeSchema
+            and var_name not in properties.__annotations__
+        - required properties were not passed in
+
+        Args:
+            arg: the input dict
+
+        Raises:
+            ApiTypeError - for missing required arguments, or for invalid properties
+        \\"\\"\\"
+        seen_required_properties = set()
+        invalid_arguments = []
+        required_property_names = getattr(cls.MetaOapg, 'required', set())
+        additional_properties = getattr(cls.MetaOapg, 'additional_properties', UnsetAnyTypeSchema)
+        properties = getattr(cls.MetaOapg, 'properties', {})
+        property_annotations = getattr(properties, '__annotations__', {})
+        for property_name in arg:
+            if property_name in required_property_names:
+                seen_required_properties.add(property_name)
+            elif property_name in property_annotations:
+                continue
+            elif additional_properties is not NotAnyTypeSchema:
+                continue
+            else:
+                invalid_arguments.append(property_name)
+        missing_required_arguments = list(required_property_names - seen_required_properties)
+        if missing_required_arguments:
+            missing_required_arguments.sort()
+            raise ApiTypeError(
+                \\"{} is missing {} required argument{}: {}\\".format(
+                    cls.__name__,
+                    len(missing_required_arguments),
+                    \\"s\\" if len(missing_required_arguments) > 1 else \\"\\",
+                    missing_required_arguments
+                )
+            )
+        if invalid_arguments:
+            invalid_arguments.sort()
+            raise ApiTypeError(
+                \\"{} was passed {} invalid argument{}: {}\\".format(
+                    cls.__name__,
+                    len(invalid_arguments),
+                    \\"s\\" if len(invalid_arguments) > 1 else \\"\\",
+                    invalid_arguments
+                )
+            )
+
+    @classmethod
+    def __validate_args(cls, arg, validation_metadata: ValidationMetadata):
+        \\"\\"\\"
+        Ensures that:
+        - values passed in for properties are valid
+        Exceptions will be raised if:
+        - invalid arguments were passed in
+
+        Args:
+            arg: the input dict
+
+        Raises:
+            ApiTypeError - for missing required arguments, or for invalid properties
+        \\"\\"\\"
+        path_to_schemas = {}
+        additional_properties = getattr(cls.MetaOapg, 'additional_properties', UnsetAnyTypeSchema)
+        properties = getattr(cls.MetaOapg, 'properties', {})
+        property_annotations = getattr(properties, '__annotations__', {})
+        for property_name, value in arg.items():
+            path_to_item = validation_metadata.path_to_item+(property_name,)
+            if property_name in property_annotations:
+                schema = property_annotations[property_name]
+            elif additional_properties is not NotAnyTypeSchema:
+                if additional_properties is UnsetAnyTypeSchema:
+                    \\"\\"\\"
+                    If additionalProperties is unset and this path_to_item does not yet have
+                    any validations on it, validate it.
+                    If it already has validations on it, skip this validation.
+                    \\"\\"\\"
+                    if path_to_item in path_to_schemas:
+                        continue
+                schema = additional_properties
+            else:
+                raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
+                    value, cls, validation_metadata.path_to_item+(property_name,)
+                ))
+            schema = cls._get_class_oapg(schema)
+            arg_validation_metadata = ValidationMetadata(
+                from_server=validation_metadata.from_server,
+                configuration=validation_metadata.configuration,
+                path_to_item=path_to_item,
+                validated_path_to_schemas=validation_metadata.validated_path_to_schemas
+            )
+            if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
+                continue
+            other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
+            update(path_to_schemas, other_path_to_schemas)
+        return path_to_schemas
+
+    @classmethod
+    def __check_dict_validations(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata
+    ):
+        if not hasattr(cls, 'MetaOapg'):
+            return
+        if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'max_properties') and
+                len(arg) > cls.MetaOapg.max_properties):
+            cls._raise_validation_error_message_oapg(
+                value=arg,
+                constraint_msg=\\"number of properties must be less than or equal to\\",
+                constraint_value=cls.MetaOapg.max_properties,
+                path_to_item=validation_metadata.path_to_item
+            )
+
+        if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
+                hasattr(cls.MetaOapg, 'min_properties') and
+                len(arg) < cls.MetaOapg.min_properties):
+            cls._raise_validation_error_message_oapg(
+                value=arg,
+                constraint_msg=\\"number of properties must be greater than or equal to\\",
+                constraint_value=cls.MetaOapg.min_properties,
+                path_to_item=validation_metadata.path_to_item
+            )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        DictBase _validate_oapg
+        We return dynamic classes of different bases depending upon the inputs
+        This makes it so:
+        - the returned instance is always a subclass of our defining schema
+            - this allows us to check type based on whether an instance is a subclass of a schema
+        - the returned instance is a serializable type (except for None, True, and False) which are enums
+
+        Returns:
+            new_cls (type): the new class
+
+        Raises:
+            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
+            ApiTypeError: when the input type is not in the list of allowed spec types
+        \\"\\"\\"
+        if isinstance(arg, frozendict.frozendict):
+            cls.__check_dict_validations(arg, validation_metadata)
+        _path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
+        if not isinstance(arg, frozendict.frozendict):
+            return _path_to_schemas
+        cls.__validate_arg_presence(arg)
+        other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
+        update(_path_to_schemas, other_path_to_schemas)
+        try:
+            discriminator = cls.MetaOapg.discriminator()
+        except AttributeError:
+            return _path_to_schemas
+        # discriminator exists
+        disc_prop_name = list(discriminator.keys())[0]
+        cls._ensure_discriminator_value_present_oapg(disc_prop_name, validation_metadata, arg)
+        discriminated_cls = cls.get_discriminated_class_oapg(
+            disc_property_name=disc_prop_name, disc_payload_value=arg[disc_prop_name])
+        if discriminated_cls is None:
+            raise ApiValueError(
+                \\"Invalid discriminator value was passed in to {}.{} Only the values {} are allowed at {}\\".format(
+                    cls.__name__,
+                    disc_prop_name,
+                    list(discriminator[disc_prop_name].keys()),
+                    validation_metadata.path_to_item + (disc_prop_name,)
+                )
+            )
+        updated_vm = ValidationMetadata(
+            configuration=validation_metadata.configuration,
+            from_server=validation_metadata.from_server,
+            path_to_item=validation_metadata.path_to_item,
+            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
+            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
+        )
+        if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
+            return _path_to_schemas
+        other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
+        update(_path_to_schemas, other_path_to_schemas)
+        return _path_to_schemas
+
+    @classmethod
+    def _get_properties_oapg(
+        cls,
+        arg: typing.Dict[str, typing.Any],
+        path_to_item: typing.Tuple[typing.Union[str, int], ...],
+        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
+    ):
+        \\"\\"\\"
+        DictBase _get_properties_oapg, this is how properties are set
+        These values already passed validation
+        \\"\\"\\"
+        dict_items = {}
+
+        for property_name_js, value in arg.items():
+            property_path_to_item = path_to_item + (property_name_js,)
+            property_cls = path_to_schemas[property_path_to_item]
+            new_value = property_cls._get_new_instance_without_conversion_oapg(
+                value,
+                property_path_to_item,
+                path_to_schemas
+            )
+            dict_items[property_name_js] = new_value
+
+        return dict_items
+
+    def __setattr__(self, name: str, value: typing.Any):
+        if not isinstance(self, FileIO):
+            raise AttributeError('property setting not supported on immutable instances')
+
+    def __getattr__(self, name: str):
+        \\"\\"\\"
+        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(
+    arg: typing.Union[str, date, datetime, uuid.UUID, decimal.Decimal, int, float, None, dict, frozendict.frozendict, list, tuple, bytes, Schema, io.FileIO, io.BufferedReader],
+    from_server: bool,
+    validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]],
+    path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']),
+) -> typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, bytes, BoolClass, NoneClass, FileIO]:
+    \\"\\"\\"
+    Casts the input payload arg into the allowed types
+    The input validated_path_to_schemas is mutated by running this function
+
+    When from_server is False then
+    - date/datetime is cast to str
+    - int/float is cast to Decimal
+
+    If a Schema instance is passed in it is converted back to a primitive instance because
+    One may need to validate that data to the original Schema class AND additional different classes
+    those additional classes will need to be added to the new manufactured class for that payload
+    If the code didn't do this and kept the payload as a Schema instance it would fail to validate to other
+    Schema classes and the code wouldn't be able to mfg a new class that includes all valid schemas
+    TODO: store the validated schema classes in validation_metadata
+
+    Args:
+        arg: the payload
+        from_server: whether this payload came from the server or not
+        validated_path_to_schemas: a dict that stores the validated classes at any path location in the payload
+    \\"\\"\\"
+    if isinstance(arg, Schema):
+        # store the already run validations
+        schema_classes = set()
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
+        validated_path_to_schemas[path_to_item] = schema_classes
+
+    type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
+    if isinstance(arg, str):
+        return str(arg)
+    elif isinstance(arg, (dict, frozendict.frozendict)):
+        return frozendict.frozendict({key: cast_to_allowed_types(val, from_server, validated_path_to_schemas, path_to_item + (key,)) for key, val in arg.items()})
+    elif isinstance(arg, (bool, BoolClass)):
+        \\"\\"\\"
+        this check must come before isinstance(arg, (int, float))
+        because isinstance(True, int) is True
+        \\"\\"\\"
+        if arg:
+            return BoolClass.TRUE
+        return BoolClass.FALSE
+    elif isinstance(arg, int):
+        return decimal.Decimal(arg)
+    elif isinstance(arg, float):
+        decimal_from_float = decimal.Decimal(arg)
+        if decimal_from_float.as_integer_ratio()[1] == 1:
+            # 9.0 -> Decimal('9.0')
+            # 3.4028234663852886e+38 -> Decimal('340282346638528859811704183484516925440.0')
+            return decimal.Decimal(str(decimal_from_float)+'.0')
+        return decimal_from_float
+    elif isinstance(arg, (tuple, list)):
+        return tuple([cast_to_allowed_types(item, from_server, validated_path_to_schemas, path_to_item + (i,)) for i, item in enumerate(arg)])
+    elif isinstance(arg, (none_type, NoneClass)):
+        return NoneClass.NONE
+    elif isinstance(arg, (date, datetime)):
+        if not from_server:
+            return arg.isoformat()
+        raise type_error
+    elif isinstance(arg, uuid.UUID):
+        if not from_server:
+            return str(arg)
+        raise type_error
+    elif isinstance(arg, decimal.Decimal):
+        return decimal.Decimal(arg)
+    elif isinstance(arg, bytes):
+        return bytes(arg)
+    elif isinstance(arg, (io.FileIO, io.BufferedReader)):
+        return FileIO(arg)
+    raise ValueError('Invalid type passed in got input={} type={}'.format(arg, type(arg)))
+
+
+class ComposedBase(Discriminable):
+
+    @classmethod
+    def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
+        path_to_schemas = defaultdict(set)
+        for allof_cls in cls.MetaOapg.all_of():
+            if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
+                continue
+            other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
+            update(path_to_schemas, other_path_to_schemas)
+        return path_to_schemas
+
+    @classmethod
+    def __get_oneof_class(
+        cls,
+        arg,
+        discriminated_cls,
+        validation_metadata: ValidationMetadata,
+    ):
+        oneof_classes = []
+        path_to_schemas = defaultdict(set)
+        for oneof_cls in cls.MetaOapg.one_of():
+            if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
+                oneof_classes.append(oneof_cls)
+                continue
+            if validation_metadata.validation_ran_earlier(oneof_cls):
+                oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
+                continue
+            try:
+                path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
+            except (ApiValueError, ApiTypeError) as ex:
+                if discriminated_cls is not None and oneof_cls is discriminated_cls:
+                    raise ex
+                continue
+            oneof_classes.append(oneof_cls)
+        if not oneof_classes:
+            raise ApiValueError(
+                \\"Invalid inputs given to generate an instance of {}. None \\"
+                \\"of the oneOf schemas matched the input data.\\".format(cls)
+            )
+        elif len(oneof_classes) > 1:
+            raise ApiValueError(
+                \\"Invalid inputs given to generate an instance of {}. Multiple \\"
+                \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
+            )
+        # exactly one class matches
+        return path_to_schemas
+
+    @classmethod
+    def __get_anyof_classes(
+        cls,
+        arg,
+        discriminated_cls,
+        validation_metadata: ValidationMetadata
+    ):
+        anyof_classes = []
+        path_to_schemas = defaultdict(set)
+        for anyof_cls in cls.MetaOapg.any_of():
+            if validation_metadata.validation_ran_earlier(anyof_cls):
+                anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
+                continue
+
+            try:
+                other_path_to_schemas = anyof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
+            except (ApiValueError, ApiTypeError) as ex:
+                if discriminated_cls is not None and anyof_cls is discriminated_cls:
+                    raise ex
+                continue
+            anyof_classes.append(anyof_cls)
+            update(path_to_schemas, other_path_to_schemas)
+        if not anyof_classes:
+            raise ApiValueError(
+                \\"Invalid inputs given to generate an instance of {}. None \\"
+                \\"of the anyOf schemas matched the input data.\\".format(cls)
+            )
+        return path_to_schemas
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
+        \\"\\"\\"
+        ComposedBase _validate_oapg
+        We return dynamic classes of different bases depending upon the inputs
+        This makes it so:
+        - the returned instance is always a subclass of our defining schema
+            - this allows us to check type based on whether an instance is a subclass of a schema
+        - the returned instance is a serializable type (except for None, True, and False) which are enums
+
+        Returns:
+            new_cls (type): the new class
+
+        Raises:
+            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
+            ApiTypeError: when the input type is not in the list of allowed spec types
+        \\"\\"\\"
+        # validation checking on types, validations, and enums
+        path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+        updated_vm = ValidationMetadata(
+            configuration=validation_metadata.configuration,
+            from_server=validation_metadata.from_server,
+            path_to_item=validation_metadata.path_to_item,
+            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
+            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
+        )
+
+        # process composed schema
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
+        discriminated_cls = None
+        if discriminator and arg and isinstance(arg, frozendict.frozendict):
+            disc_property_name = list(discriminator.keys())[0]
+            cls._ensure_discriminator_value_present_oapg(disc_property_name, updated_vm, arg)
+            # get discriminated_cls by looking at the dict in the current class
+            discriminated_cls = cls.get_discriminated_class_oapg(
+                disc_property_name=disc_property_name, disc_payload_value=arg[disc_property_name])
+            if discriminated_cls is None:
+                raise ApiValueError(
+                    \\"Invalid discriminator value '{}' was passed in to {}.{} Only the values {} are allowed at {}\\".format(
+                        arg[disc_property_name],
+                        cls.__name__,
+                        disc_property_name,
+                        list(discriminator[disc_property_name].keys()),
+                        updated_vm.path_to_item + (disc_property_name,)
+                    )
+                )
+
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'all_of'):
+            other_path_to_schemas = cls.__get_allof_classes(arg, validation_metadata=updated_vm)
+            update(path_to_schemas, other_path_to_schemas)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'one_of'):
+            other_path_to_schemas = cls.__get_oneof_class(
+                arg,
+                discriminated_cls=discriminated_cls,
+                validation_metadata=updated_vm
+            )
+            update(path_to_schemas, other_path_to_schemas)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'any_of'):
+            other_path_to_schemas = cls.__get_anyof_classes(
+                arg,
+                discriminated_cls=discriminated_cls,
+                validation_metadata=updated_vm
+            )
+            update(path_to_schemas, other_path_to_schemas)
+        not_cls = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
+        if not_cls:
+            other_path_to_schemas = None
+            not_exception = ApiValueError(
+                \\"Invalid value '{}' was passed in to {}. Value is invalid because it is disallowed by {}\\".format(
+                    arg,
+                    cls.__name__,
+                    not_cls.__name__,
+                )
+            )
+            if updated_vm.validation_ran_earlier(not_cls):
+                raise not_exception
+
+            try:
+                other_path_to_schemas = not_cls._validate_oapg(arg, validation_metadata=updated_vm)
+            except (ApiValueError, ApiTypeError):
+                pass
+            if other_path_to_schemas:
+                raise not_exception
+
+        if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
+            # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
+            assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
+        return path_to_schemas
+
+
+# DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
+class ComposedSchema(
+    ComposedBase,
+    DictBase,
+    ListBase,
+    NumberBase,
+    StrBase,
+    BoolBase,
+    NoneBase,
+    Schema,
+    NoneFrozenDictTupleStrDecimalBoolMixin
+):
+    @classmethod
+    def from_openapi_data_oapg(cls, *args: typing.Any, _configuration: typing.Optional[Configuration] = None, **kwargs):
+        if not args:
+            if not kwargs:
+                raise ApiTypeError('{} is missing required input data in args or kwargs'.format(cls.__name__))
+            args = (kwargs, )
+        return super().from_openapi_data_oapg(args[0], _configuration=_configuration)
+
+
+class ListSchema(
+    ListBase,
+    Schema,
+    TupleMixin
+):
+
+    @classmethod
+    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
+        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
+
+
+class NoneSchema(
+    NoneBase,
+    Schema,
+    NoneMixin
+):
+
+    @classmethod
+    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
+        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
+
+
+class NumberSchema(
+    NumberBase,
+    Schema,
+    DecimalMixin
+):
+    \\"\\"\\"
+    This is used for type: number with no format
+    Both integers AND floats are accepted
+    \\"\\"\\"
+
+    @classmethod
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
+        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
+
+
+class IntBase:
+    @property
+    def as_int_oapg(self) -> int:
+        try:
+            return self._as_int
+        except AttributeError:
+            self._as_int = int(self)
+            return self._as_int
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+
+            denominator = arg.as_integer_ratio()[-1]
+            if denominator != 1:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type integer at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        IntBase _validate_oapg
+        TODO what about types = (int, number) -> IntBase, NumberBase? We could drop int and keep number only
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class IntSchema(IntBase, NumberSchema):
+
+    @classmethod
+    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
+        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
+
+
+class Int32Base:
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class Int32Schema(
+    Int32Base,
+    IntSchema
+):
+    pass
+
+
+class Int64Base:
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class Int64Schema(
+    Int64Base,
+    IntSchema
+):
+    pass
+
+
+class Float32Base:
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+
+class Float32Schema(
+    Float32Base,
+    NumberSchema
+):
+
+    @classmethod
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
+        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+
+
+class Float64Base:
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+
+class Float64Schema(
+    Float64Base,
+    NumberSchema
+):
+
+    @classmethod
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
+        # todo check format
+        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+
+
+class StrSchema(
+    StrBase,
+    Schema,
+    StrMixin
+):
+    \\"\\"\\"
+    date + datetime string types must inherit from this class
+    That is because one can validate a str payload as both:
+    - type: string (format unset)
+    - type: string, format: date
+    \\"\\"\\"
+
+    @classmethod
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
+
+
+class UUIDSchema(UUIDBase, StrSchema):
+
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
+
+
+class DateSchema(DateBase, StrSchema):
+
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
+
+
+class DateTimeSchema(DateTimeBase, StrSchema):
+
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
+
+
+class DecimalSchema(DecimalBase, StrSchema):
+
+    def __new__(cls, _arg: str, **kwargs: Configuration):
+        \\"\\"\\"
+        Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
+        which can be simple (str) or complex (dicts or lists with nested values)
+        Because casting is only done once and recursively casts all values prior to validation then for a potential
+        client side Decimal input if Decimal was accepted as an input in DecimalSchema then one would not know
+        if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
+        where it should stay as Decimal.
+        \\"\\"\\"
+        return super().__new__(cls, _arg, **kwargs)
+
+
+class BytesSchema(
+    Schema,
+    BytesMixin
+):
+    \\"\\"\\"
+    this class will subclass bytes and is immutable
+    \\"\\"\\"
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
+
+
+class FileSchema(
+    Schema,
+    FileMixin
+):
+    \\"\\"\\"
+    This class is NOT immutable
+    Dynamic classes are built using it for example when AnyType allows in binary data
+    Al other schema classes ARE immutable
+    If one wanted to make this immutable one could make this a DictSchema with required properties:
+    - data = BytesSchema (which would be an immutable bytes based schema)
+    - file_name = StrSchema
+    and cast_to_allowed_types would convert bytes and file instances into dicts containing data + file_name
+    The downside would be that data would be stored in memory which one may not want to do for very large files
+
+    The developer is responsible for closing this file and deleting it
+
+    This class was kept as mutable:
+    - to allow file reading and writing to disk
+    - to be able to preserve file name info
+    \\"\\"\\"
+
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
+
+
+class BinaryBase:
+    pass
+
+
+class BinarySchema(
+    ComposedBase,
+    BinaryBase,
+    Schema,
+    BinaryMixin
+):
+    class MetaOapg:
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
+
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
+
+
+class BoolSchema(
+    BoolBase,
+    Schema,
+    BoolMixin
+):
+
+    @classmethod
+    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
+        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
+
+
+class AnyTypeSchema(
+    DictBase,
+    ListBase,
+    NumberBase,
+    StrBase,
+    BoolBase,
+    NoneBase,
+    Schema,
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
+):
+    # Python representation of a schema defined as true or {}
+    pass
+
+
+class UnsetAnyTypeSchema(AnyTypeSchema):
+    # Used when additionalProperties/items was not explicitly defined and a defining schema is needed
+    pass
+
+
+class NotAnyTypeSchema(
+    ComposedSchema,
+):
+    \\"\\"\\"
+    Python representation of a schema defined as false or {'not': {}}
+    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(
+    DictBase,
+    Schema,
+    FrozenDictMixin
+):
+    @classmethod
+    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
+        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+
+    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)
+
+
+schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
+
+
+@functools.lru_cache()
+def get_new_class(
+    class_name: str,
+    bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
+) -> typing.Type[Schema]:
+    \\"\\"\\"
+    Returns a new class that is made with the subclass bases
+    \\"\\"\\"
+    new_cls: typing.Type[Schema] = type(class_name, bases, {})
+    return new_cls
+
+
+LOG_CACHE_USAGE = False
+
+
+def log_cache_usage(cache_fn):
+    if LOG_CACHE_USAGE:
+        print(cache_fn.__name__, cache_fn.cache_info())",
+  "test/test_models/__init__.py": "",
+  "test/test_paths/__init__.py": "import json
+import typing
+
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+
+
+class ApiTestMixin:
+    json_content_type = 'application/json'
+    user_agent = 'OpenAPI-Generator/1.0.0/python'
+
+    @classmethod
+    def assert_pool_manager_request_called_with(
+        cls,
+        mock_request,
+        url: str,
+        method: str = 'POST',
+        body: typing.Optional[bytes] = None,
+        content_type: typing.Optional[str] = None,
+        accept_content_type: typing.Optional[str] = None,
+        stream: bool = False,
+    ):
+        headers = {
+            'User-Agent': cls.user_agent
+        }
+        if accept_content_type:
+            headers['Accept'] = accept_content_type
+        if content_type:
+            headers['Content-Type'] = content_type
+        kwargs = dict(
+            headers=HTTPHeaderDict(headers),
+            preload_content=not stream,
+            timeout=None,
+        )
+        if content_type and method != 'GET':
+            kwargs['body'] = body
+        mock_request.assert_called_with(
+            method,
+            url,
+            **kwargs
+        )
+
+    @staticmethod
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
+        return {'content-type': content_type}
+
+    @classmethod
+    def response(
+        cls,
+        body: typing.Union[str, bytes],
+        status: int = 200,
+        content_type: str = json_content_type,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
+        preload_content: bool = True
+    ) -> urllib3.HTTPResponse:
+        if headers is None:
+            headers = {}
+        headers.update(cls.headers_for_content_type(content_type))
+        return urllib3.HTTPResponse(
+            body,
+            headers=headers,
+            status=status,
+            preload_content=preload_content
+        )
+
+    @staticmethod
+    def json_bytes(in_data: typing.Any) -> bytes:
+        return json.dumps(in_data, separators=(\\",\\", \\":\\"), ensure_ascii=False).encode('utf-8')
+",
+  "test/test_paths/test_both/__init__.py": "",
+  "test/test_paths/test_both/test_get.py": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+import unittest
+from unittest.mock import patch
+
+import urllib3
+
+import test
+from test.paths.both import get  # noqa: E501
+from test import configuration, schemas, api_client
+
+from .. import ApiTestMixin
+
+
+class TestBoth(ApiTestMixin, unittest.TestCase):
+    \\"\\"\\"
+    Both unit test stubs
+    \\"\\"\\"
+    _configuration = configuration.Configuration()
+
+    def setUp(self):
+        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    response_status = 200
+    response_body = ''
+
+
+if __name__ == '__main__':
+    unittest.main()
+",
+  "test/test_paths/test_neither/__init__.py": "",
+  "test/test_paths/test_neither/test_get.py": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+import unittest
+from unittest.mock import patch
+
+import urllib3
+
+import test
+from test.paths.neither import get  # noqa: E501
+from test import configuration, schemas, api_client
+
+from .. import ApiTestMixin
+
+
+class TestNeither(ApiTestMixin, unittest.TestCase):
+    \\"\\"\\"
+    Neither unit test stubs
+    \\"\\"\\"
+    _configuration = configuration.Configuration()
+
+    def setUp(self):
+        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    response_status = 200
+    response_body = ''
+
+
+if __name__ == '__main__':
+    unittest.main()
+",
+  "test/test_paths/test_tag1/__init__.py": "",
+  "test/test_paths/test_tag1/test_get.py": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+import unittest
+from unittest.mock import patch
+
+import urllib3
+
+import test
+from test.paths.tag1 import get  # noqa: E501
+from test import configuration, schemas, api_client
+
+from .. import ApiTestMixin
+
+
+class TestTag1(ApiTestMixin, unittest.TestCase):
+    \\"\\"\\"
+    Tag1 unit test stubs
+    \\"\\"\\"
+    _configuration = configuration.Configuration()
+
+    def setUp(self):
+        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    response_status = 200
+    response_body = ''
+
+
+if __name__ == '__main__':
+    unittest.main()
+",
+  "test/test_paths/test_tag2/__init__.py": "",
+  "test/test_paths/test_tag2/test_get.py": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+import unittest
+from unittest.mock import patch
+
+import urllib3
+
+import test
+from test.paths.tag2 import get  # noqa: E501
+from test import configuration, schemas, api_client
+
+from .. import ApiTestMixin
+
+
+class TestTag2(ApiTestMixin, unittest.TestCase):
+    \\"\\"\\"
+    Tag2 unit test stubs
+    \\"\\"\\"
+    _configuration = configuration.Configuration()
+
+    def setUp(self):
+        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    response_status = 200
+    response_body = ''
+
+
+if __name__ == '__main__':
+    unittest.main()
+",
+  "tests/__init__.py": "",
+  "tests/test_example.py": "import pytest
+
+from test.example import hello
+
+@pytest.mark.parametrize(
+    (\\"name\\", \\"expected\\"),
+    [
+        (\\"A. Musing\\", \\"Hello A. Musing!\\"),
+        (\\"traveler\\", \\"Hello traveler!\\"),
+        (\\"projen developer\\", \\"Hello projen developer!\\"),
+    ],
+)
+def test_hello(name, expected):
+    \\"\\"\\"Example test with parametrization.\\"\\"\\"
+    assert hello(name) == expected
+",
+  "tox.ini": "[tox]
+envlist = py37
+
+[testenv]
+passenv = PYTHON_VERSION
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+
+commands=
+   pytest --cov=test
+",
+}
+`;
+
+exports[`Generated Python Client Code Unit Tests Single 1`] = `
+Object {
+  ".gitattributes": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+
+/.gitattributes linguist-generated
+/.github/workflows/pull-request-lint.yml linguist-generated
+/.gitignore linguist-generated
+/.projen/** linguist-generated
+/.projen/deps.json linguist-generated
+/.projen/files.json linguist-generated
+/.projen/tasks.json linguist-generated
+/requirements-dev.txt linguist-generated
+/requirements.txt linguist-generated",
+  ".github/workflows/pull-request-lint.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+
+name: pull-request-lint
+on:
+  pull_request_target:
+    types:
+      - labeled
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+      - edited
+jobs:
+  validate:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5.0.2
+        env:
+          GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }}
+        with:
+          types: |-
+            feat
+            fix
+            chore
+          requireScope: false
+",
+  ".gitignore": "# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+dev-requirements.txt.log
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
+",
+  ".gitlab-ci.yml": "# ref: https://docs.gitlab.com/ee/ci/README.html
+
+stages:
+  - test
+
+.tests:
+  stage: test
+  script:
+   - pip install -r requirements.txt
+   - pip install -r test-requirements.txt
+   - pytest --cov=test
+
+test-3.5:
+  extends: .tests
+  image: python:3.5-alpine
+test-3.6:
+  extends: .tests
+  image: python:3.6-alpine
+test-3.7:
+  extends: .tests
+  image: python:3.7-alpine
+test-3.8:
+  extends: .tests
+  image: python:3.8-alpine
+",
+  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
+",
+  ".openapi-generator/FILES": ".gitignore
+.gitlab-ci.yml
+.openapi-generator-ignore
+.travis.yml
+README.md
+docs/apis/tags/DefaultApi.md
+docs/models/ApiError.md
+docs/models/TestRequest.md
+docs/models/TestResponse.md
+git_push.sh
+requirements.txt
+setup.cfg
+setup.py
+test-requirements.txt
+test/__init__.py
+test/__init__.py
+test/api_client.py
+test/apis/__init__.py
+test/apis/tags/default_api.py
+test/apis/tags/default_api_operation_config.py
+test/configuration.py
+test/exceptions.py
+test/model/__init__.py
+test/model/api_error.py
+test/model/api_error.pyi
+test/model/test_request.py
+test/model/test_request.pyi
+test/model/test_response.py
+test/model/test_response.pyi
+test/models/__init__.py
+test/rest.py
+test/schemas.py
+test/test_models/__init__.py
+test/test_models/test_api_error.py
+test/test_models/test_test_request.py
+test/test_models/test_test_response.py
+tox.ini
+",
+  ".openapi-generator/VERSION": "6.3.0",
+  ".projen/deps.json": Object {
+    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
+    "dependencies": Array [
+      Object {
+        "name": "projen",
+        "type": "devenv",
+        "version": "99.99.99",
+      },
+      Object {
+        "name": "pytest",
+        "type": "test",
+        "version": "6.2.1",
+      },
+    ],
+  },
+  ".projen/files.json": Object {
+    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
+    "files": Array [
+      ".gitattributes",
+      ".github/workflows/pull-request-lint.yml",
+      ".gitignore",
+      ".projen/deps.json",
+      ".projen/files.json",
+      ".projen/tasks.json",
+      "requirements-dev.txt",
+      "requirements.txt",
+    ],
+  },
+  ".projen/tasks.json": Object {
+    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
+    "env": Object {
+      "PATH": "$(echo $PWD/.env/bin:$PATH)",
+      "VIRTUAL_ENV": "$(echo $PWD/.env)",
+    },
+    "tasks": Object {
+      "build": Object {
+        "description": "Full release build",
+        "name": "build",
+        "steps": Array [
+          Object {
+            "spawn": "default",
+          },
+          Object {
+            "spawn": "pre-compile",
+          },
+          Object {
+            "spawn": "compile",
+          },
+          Object {
+            "spawn": "post-compile",
+          },
+          Object {
+            "spawn": "test",
+          },
+          Object {
+            "spawn": "package",
+          },
+        ],
+      },
+      "clobber": Object {
+        "condition": "git diff --exit-code > /dev/null",
+        "description": "hard resets to HEAD of origin and cleans the local repo",
+        "env": Object {
+          "BRANCH": "$(git branch --show-current)",
+        },
+        "name": "clobber",
+        "steps": Array [
+          Object {
+            "exec": "git checkout -b scratch",
+            "name": "save current HEAD in \\"scratch\\" branch",
+          },
+          Object {
+            "exec": "git checkout $BRANCH",
+          },
+          Object {
+            "exec": "git fetch origin",
+            "name": "fetch latest changes from origin",
+          },
+          Object {
+            "exec": "git reset --hard origin/$BRANCH",
+            "name": "hard reset to origin commit",
+          },
+          Object {
+            "exec": "git clean -fdx",
+            "name": "clean all untracked files",
+          },
+          Object {
+            "say": "ready to rock! (unpushed commits are under the \\"scratch\\" branch)",
+          },
+        ],
+      },
+      "compile": Object {
+        "description": "Only compile",
+        "name": "compile",
+      },
+      "default": Object {
+        "description": "Synthesize project files",
+        "name": "default",
+        "steps": Array [
+          Object {
+            "exec": "python .projenrc.py",
+          },
+        ],
+      },
+      "eject": Object {
+        "description": "Remove projen from the project",
+        "env": Object {
+          "PROJEN_EJECTING": "true",
+        },
+        "name": "eject",
+        "steps": Array [
+          Object {
+            "spawn": "default",
+          },
+        ],
+      },
+      "install": Object {
+        "description": "Install and upgrade dependencies",
+        "name": "install",
+        "steps": Array [
+          Object {
+            "exec": "pip install --upgrade pip",
+          },
+          Object {
+            "exec": "pip install -r requirements.txt",
+          },
+          Object {
+            "exec": "pip install -r requirements-dev.txt",
+          },
+        ],
+      },
+      "package": Object {
+        "description": "Creates the distribution package",
+        "name": "package",
+      },
+      "post-compile": Object {
+        "description": "Runs after successful compilation",
+        "name": "post-compile",
+      },
+      "pre-compile": Object {
+        "description": "Prepare the project for compilation",
+        "name": "pre-compile",
+      },
+      "test": Object {
+        "description": "Run tests",
+        "name": "test",
+        "steps": Array [
+          Object {
+            "exec": "pytest",
+          },
+        ],
+      },
+    },
+  },
+  ".travis.yml": "# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - \\"3.5\\"
+  - \\"3.6\\"
+  - \\"3.7\\"
+  - \\"3.8\\"
+# command to install dependencies
+install:
+  - \\"pip install -r requirements.txt\\"
+  - \\"pip install -r test-requirements.txt\\"
+# command to run tests
+script: pytest --cov=test
+",
+  "README.md": "# test
+No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
+
+## Requirements.
+
+Python &gt;&#x3D;3.7
+
+## Migration from other generators like python and python-legacy
+
+### Changes
+1. This generator uses spec case for all (object) property names and parameter names.
+    - So if the spec has a property name like camelCase, it will use camelCase rather than camel_case
+    - So you will need to update how you input and read properties to use spec case
+2. Endpoint parameters are stored in dictionaries to prevent collisions (explanation below)
+    - So you will need to update how you pass data in to endpoints
+3. Endpoint responses now include the original response, the deserialized response body, and (todo)the deserialized headers
+    - So you will need to update your code to use response.body to access deserialized data
+4. All validated data is instantiated in an instance that subclasses all validated Schema classes and Decimal/str/list/tuple/frozendict/NoneClass/BoolClass/bytes/io.FileIO
+    - This means that you can use isinstance to check if a payload validated against a schema class
+    - This means that no data will be of type None/True/False
+        - ingested None will subclass NoneClass
+        - ingested True will subclass BoolClass
+        - ingested False will subclass BoolClass
+        - So if you need to check is True/False/None, instead use instance.is_true_oapg()/.is_false_oapg()/.is_none_oapg()
+5. All validated class instances are immutable except for ones based on io.File
+    - This is because if properties were changed after validation, that validation would no longer apply
+    - So no changing values or property values after a class has been instantiated
+6. String + Number types with formats
+    - String type data is stored as a string and if you need to access types based on its format like date,
+    date-time, uuid, number etc then you will need to use accessor functions on the instance
+    - type string + format: See .as_date_oapg, .as_datetime_oapg, .as_decimal_oapg, .as_uuid_oapg
+    - type number + format: See .as_float_oapg, .as_int_oapg
+    - this was done because openapi/json-schema defines constraints. string data may be type string with no format
+    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. 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
+
+### Why are Oapg and _oapg used in class and method names?
+Classes can have arbitrarily named properties set on them
+Endpoints can have arbitrary operationId method names set
+For those reasons, I use the prefix Oapg and _oapg to greatly reduce the likelihood of collisions
+on protected + public classes/methods.
+oapg stands for OpenApi Python Generator.
+
+### Object property spec case
+This was done because when payloads are ingested, they can be validated against N number of schemas.
+If the input signature used a different property name then that has mutated the payload.
+So SchemaA and SchemaB must both see the camelCase spec named variable.
+Also it is possible to send in two properties, named camelCase and camel_case in the same payload.
+That use case should be support so spec case is used.
+
+### Parameter spec case
+Parameters can be included in different locations including:
+- query
+- path
+- header
+- cookie
+
+Any of those parameters could use the same parameter names, so if every parameter
+was included as an endpoint parameter in a function signature, they would collide.
+For that reason, each of those inputs have been separated out into separate typed dictionaries:
+- query_params
+- path_params
+- header_params
+- cookie_params
+
+So when updating your code, you will need to pass endpoint parameters in using those
+dictionaries.
+
+### Endpoint responses
+Endpoint responses have been enriched to now include more information.
+Any response reom an endpoint will now include the following properties:
+response: urllib3.HTTPResponse
+body: typing.Union[Unset, Schema]
+headers: typing.Union[Unset, TODO]
+Note: response header deserialization has not yet been added
+
+
+## Installation & Usage
+### pip install
+
+If the python package is hosted on a repository, you can install directly using:
+
+\`\`\`sh
+pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
+\`\`\`
+(you may need to run \`pip\` with root permission: \`sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git\`)
+
+Then import the package:
+\`\`\`python
+import test
+\`\`\`
+
+### Setuptools
+
+Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
+
+\`\`\`sh
+python setup.py install --user
+\`\`\`
+(or \`sudo python setup.py install\` to install the package for all users)
+
+Then import the package:
+\`\`\`python
+import test
+\`\`\`
+
+## Getting Started
+
+Please follow the [installation procedure](#installation--usage) and then run the following:
+
+\`\`\`python
+
+import time
+import test
+from pprint import pprint
+from test.apis.tags import default_api
+from test.model.api_error import ApiError
+from test.model.test_request import TestRequest
+from test.model.test_response import TestResponse
+# Defining the host is optional and defaults to http://localhost
+# See configuration.py for a list of all supported configuration parameters.
+configuration = test.Configuration(
+    host = \\"http://localhost\\"
+)
+
+
+# Enter a context with an instance of the API client
+with test.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = default_api.DefaultApi(api_client)
+    body = None # bool, date, datetime, dict, float, int, list, str, none_type |  (optional)
+
+    try:
+        api_response = api_instance.any_request_response(body=body)
+        pprint(api_response)
+    except test.ApiException as e:
+        print(\\"Exception when calling DefaultApi->any_request_response: %s\\\\n\\" % e)
+\`\`\`
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://localhost*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*DefaultApi* | [**any_request_response**](docs/apis/tags/DefaultApi.md#any_request_response) | **put** /any-request-response | 
+*DefaultApi* | [**empty**](docs/apis/tags/DefaultApi.md#empty) | **put** /empty-response | 
+*DefaultApi* | [**media_types**](docs/apis/tags/DefaultApi.md#media_types) | **post** /different-media-type | 
+*DefaultApi* | [**operation_one**](docs/apis/tags/DefaultApi.md#operation_one) | **post** /path/{pathParam} | 
+*DefaultApi* | [**without_operation_id_delete**](docs/apis/tags/DefaultApi.md#without_operation_id_delete) | **delete** /without-operation-id | 
+
+## Documentation For Models
+
+ - [ApiError](docs/models/ApiError.md)
+ - [TestRequest](docs/models/TestRequest.md)
+ - [TestResponse](docs/models/TestResponse.md)
+
+## Documentation For Authorization
+
+ All endpoints do not require authorization.
+
+## Author
+
+
+
+## Notes for Large OpenAPI documents
+If the OpenAPI document is large, imports in test.apis and test.models may fail with a
+RecursionError indicating the maximum recursion limit has been exceeded. In that case, there are a couple of solutions:
+
+Solution 1:
+Use specific imports for apis and models like:
+- \`from test.apis.default_api import DefaultApi\`
+- \`from test.model.pet import Pet\`
+
+Solution 1:
+Before importing the package, adjust the maximum recursion limit as shown below:
+\`\`\`
+import sys
+sys.setrecursionlimit(1500)
+import test
+from test.apis import *
+from test.models import *
+\`\`\`
+",
+  "docs/apis/tags/DefaultApi.md": "<a name=\\"__pageTop\\"></a>
+# test.apis.tags.default_api.DefaultApi
+
+All URIs are relative to *http://localhost*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**any_request_response**](#any_request_response) | **put** /any-request-response | 
+[**empty**](#empty) | **put** /empty-response | 
+[**media_types**](#media_types) | **post** /different-media-type | 
+[**operation_one**](#operation_one) | **post** /path/{pathParam} | 
+[**without_operation_id_delete**](#without_operation_id_delete) | **delete** /without-operation-id | 
+
+# **any_request_response**
+<a name=\\"any_request_response\\"></a>
+> bool, date, datetime, dict, float, int, list, str, none_type any_request_response()
+
+
+
+### Example
+
+\`\`\`python
+import test
+from test.apis.tags import default_api
+from pprint import pprint
+# Defining the host is optional and defaults to http://localhost
+# See configuration.py for a list of all supported configuration parameters.
+configuration = test.Configuration(
+    host = \\"http://localhost\\"
+)
+
+# Enter a context with an instance of the API client
+with test.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = default_api.DefaultApi(api_client)
+
+    # example passing only optional values
+    body = None
+    try:
+        api_response = api_instance.any_request_response(
+            body=body,
+        )
+        pprint(api_response)
+    except test.ApiException as e:
+        print(\\"Exception when calling DefaultApi->any_request_response: %s\\\\n\\" % e)
+\`\`\`
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+body | typing.Union[SchemaForRequestBodyApplicationJson, Unset] | optional, default is unset |
+content_type | str | optional, default is 'application/json' | Selects the schema and serialization of the request body
+accept_content_types | typing.Tuple[str] | default is ('application/json', ) | Tells the server the content type(s) that are accepted by the client
+stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
 timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
 skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
 
 ### body
 
-#### SchemaForRequestBodyApplicationJson
+# SchemaForRequestBodyApplicationJson
 
-Type | Description | Notes
-------------- | ------------- | -------------
-typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Any response
+200 | [ApiResponseFor200](#any_request_response.ApiResponseFor200) | Any response
 
-#### ApiResponseFor200
+#### any_request_response.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
-
-Type | Description | Notes
-------------- | ------------- | -------------
-typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
-
+# SchemaFor200ResponseBodyApplicationJson
 
-**bool, date, datetime, dict, float, int, list, str, none_type**
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO |  | 
 
 ### Authorization
 
@@ -7751,18 +16794,15 @@ This endpoint does not need any parameter.
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-204 | ApiResponseFor204 | No response body!
+204 | [ApiResponseFor204](#empty.ApiResponseFor204) | No response body!
 
-#### ApiResponseFor204
+#### empty.ApiResponseFor204
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | Unset | body was not defined |
 headers | Unset | headers were not defined |
 
-
-void (empty response body)
-
 ### Authorization
 
 No authorization required
@@ -7815,34 +16855,33 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 ### body
 
-#### SchemaForRequestBodyApplicationPdf
+# SchemaForRequestBodyApplicationPdf
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**file_type** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+bytes, io.FileIO, io.BufferedReader,  | bytes, FileIO,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Success
+200 | [ApiResponseFor200](#media_types.ApiResponseFor200) | Success
 
-#### ApiResponseFor200
+#### media_types.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationXMpegurl, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationXMpegurl
-
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
-
+# SchemaFor200ResponseBodyApplicationXMpegurl
 
-**str**
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Authorization
 
@@ -7940,10 +16979,10 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 ### body
 
-#### SchemaForRequestBodyApplicationJson
+# SchemaForRequestBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**TestRequest**](TestRequest.md) |  | 
+[**TestRequest**](../../models/TestRequest.md) |  | 
 
 
 ### query_params
@@ -7957,29 +16996,38 @@ param3 | Param3Schema | |
 param4 | Param4Schema | | optional
 
 
-#### Param1Schema
+# Param1Schema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
-#### Param2Schema
+# Param2Schema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**[str]** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+list, tuple,  | tuple,  |  | 
 
-#### Param3Schema
+### Tuple Items
+Class Name | Input Type | Accessed Type | Description | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+items | str,  | str,  |  | 
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**int, float** |  | 
+# Param3Schema
+
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+decimal.Decimal, int, float,  | decimal.Decimal,  |  | 
 
-#### Param4Schema
+# Param4Schema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### path_params
 #### RequestPathParams
@@ -7988,49 +17036,47 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 pathParam | PathParamSchema | | 
 
-#### PathParamSchema
+# PathParamSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#operation_one.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#operation_one.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### operation_one.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**TestResponse**](TestResponse.md) |  | 
+[**TestResponse**](../../models/TestResponse.md) |  | 
 
 
-#### ApiResponseFor400
+#### operation_one.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiError**](ApiError.md) |  | 
-
+[**ApiError**](../../models/ApiError.md) |  | 
 
 
-[**TestResponse**](TestResponse.md)
-
 ### Authorization
 
 No authorization required
@@ -8076,24 +17122,21 @@ This endpoint does not need any parameter.
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
+200 | [ApiResponseFor200](#without_operation_id_delete.ApiResponseFor200) | Successful response
 
-#### ApiResponseFor200
+#### without_operation_id_delete.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**TestResponse**](TestResponse.md) |  | 
-
+[**TestResponse**](../../models/TestResponse.md) |  | 
 
 
-[**TestResponse**](TestResponse.md)
-
 ### Authorization
 
 No authorization required
@@ -8103,33 +17146,74 @@ No authorization required
 ",
   "docs/models/ApiError.md": "# test.model.api_error.ApiError
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
+
+",
+  "docs/models/TestRequest.md": "# test.model.test_request.TestRequest
+
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**myInput** | decimal.Decimal, int, float,  | decimal.Decimal,  |  | [optional] 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
-",
-  "docs/models/TestRequest.md": "# test.model.test_request.TestRequest
+",
+  "docs/models/TestResponse.md": "# test.model.test_response.TestResponse
+
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**[messages](#messages)** | list, tuple,  | tuple,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
+
+# messages
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**myInput** | **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]
+list, tuple,  | tuple,  |  | 
 
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+### Tuple Items
+Class Name | Input Type | Accessed Type | Description | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+[items](#items) | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
 
-",
-  "docs/models/TestResponse.md": "# test.model.test_response.TestResponse
+# items
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**messages** | **[{str: (bool, date, datetime, dict, float, int, list, str, none_type)}]** |  | 
-**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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**id** | decimal.Decimal, int,  | decimal.Decimal,  |  | 
+**message** | str,  | str,  |  | [optional] 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -8137,7 +17221,7 @@ Name | Type | Description | Notes
   "git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -8196,11 +17280,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "setup.cfg": "[flake8]
 max-line-length=99
@@ -8228,10 +17313,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -8242,7 +17329,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -8284,9 +17371,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -8316,6 +17404,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -8558,7 +17648,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -8587,8 +17677,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -8615,7 +17722,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -8662,8 +17768,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -8758,7 +17867,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -8776,7 +17885,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -8839,8 +17948,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -8879,12 +17986,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -8943,7 +18055,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -8972,7 +18084,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -8984,7 +18096,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -9000,7 +18112,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9039,14 +18151,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -9063,23 +18175,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -9100,6 +18195,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -9119,13 +18227,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -9167,8 +18278,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -9238,7 +18349,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -9295,15 +18406,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -9315,7 +18429,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -9508,7 +18622,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -9580,9 +18694,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -9626,24 +18740,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -9699,7 +18813,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -9733,12 +18847,11 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "test/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "test/apis/path_to_api.py": "import typing
+  "test/apis/path_to_api.py": "import typing_extensions
 
 from test.paths import PathValues
 from test.apis.paths.path_path_param import PathPathParam
@@ -9747,7 +18860,7 @@ from test.apis.paths.empty_response import EmptyResponse
 from test.apis.paths.any_request_response import AnyRequestResponse
 from test.apis.paths.different_media_type import DifferentMediaType
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.PATH_PATH_PARAM: PathPathParam,
@@ -9812,12 +18925,12 @@ class WithoutOperationId(
 ):
     pass
 ",
-  "test/apis/tag_to_api.py": "import typing
+  "test/apis/tag_to_api.py": "import typing_extensions
 
 from test.apis.tags import TagValues
 from test.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -10493,14 +19606,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -10518,26 +19633,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -10871,6 +19966,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -10960,19 +20059,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -11021,6 +20127,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11042,6 +20149,7 @@ class ApiError(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11051,36 +20159,36 @@ class ApiError(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiError':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11103,6 +20211,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11124,6 +20233,7 @@ class ApiError(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11133,36 +20243,36 @@ class ApiError(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiError':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11185,6 +20295,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11203,6 +20314,7 @@ class TestRequest(
 
 
     class MetaOapg:
+        
         class properties:
             myInput = schemas.NumberSchema
             __annotations__ = {
@@ -11210,36 +20322,36 @@ class TestRequest(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"myInput\\"]) -> MetaOapg.properties.myInput: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"myInput\\"]) -> MetaOapg.properties.myInput: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"myInput\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"myInput\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"myInput\\"]) -> typing.Union[MetaOapg.properties.myInput, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"myInput\\"]) -> typing.Union[MetaOapg.properties.myInput, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"myInput\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"myInput\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         myInput: typing.Union[MetaOapg.properties.myInput, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TestRequest':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             myInput=myInput,
             _configuration=_configuration,
             **kwargs,
@@ -11262,6 +20374,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11280,6 +20393,7 @@ class TestRequest(
 
 
     class MetaOapg:
+        
         class properties:
             myInput = schemas.NumberSchema
             __annotations__ = {
@@ -11287,36 +20401,36 @@ class TestRequest(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"myInput\\"]) -> MetaOapg.properties.myInput: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"myInput\\"]) -> MetaOapg.properties.myInput: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"myInput\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"myInput\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"myInput\\"]) -> typing.Union[MetaOapg.properties.myInput, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"myInput\\"]) -> typing.Union[MetaOapg.properties.myInput, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"myInput\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"myInput\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         myInput: typing.Union[MetaOapg.properties.myInput, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TestRequest':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             myInput=myInput,
             _configuration=_configuration,
             **kwargs,
@@ -11339,6 +20453,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11360,6 +20475,7 @@ class TestResponse(
         required = {
             \\"messages\\",
         }
+        
         class properties:
             
             
@@ -11380,6 +20496,7 @@ class TestResponse(
                             required = {
                                 \\"id\\",
                             }
+                            
                             class properties:
                                 message = schemas.StrSchema
                                 id = schemas.IntSchema
@@ -11391,43 +20508,43 @@ class TestResponse(
                         id: MetaOapg.properties.id
                         
                         @typing.overload
-                        def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+                        def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
                         
                         @typing.overload
-                        def __getitem__(self, name: typing.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
+                        def __getitem__(self, name: typing_extensions.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
                         
                         @typing.overload
                         def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
                         
-                        def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", \\"id\\", ], str]):
+                        def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", \\"id\\", ], str]):
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
                         
                         
                         @typing.overload
-                        def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
+                        def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
                         
                         @typing.overload
-                        def get_item_oapg(self, name: typing.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
+                        def get_item_oapg(self, name: typing_extensions.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
                         
                         @typing.overload
                         def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                         
-                        def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", \\"id\\", ], str]):
+                        def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", \\"id\\", ], str]):
                             return super().get_item_oapg(name)
                         
                     
                         def __new__(
                             cls,
-                            *args: typing.Union[dict, frozendict.frozendict, ],
-                            id: typing.Union[MetaOapg.properties.id, int, ],
+                            *_args: typing.Union[dict, frozendict.frozendict, ],
+                            id: typing.Union[MetaOapg.properties.id, decimal.Decimal, int, ],
                             message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
                             _configuration: typing.Optional[schemas.Configuration] = None,
                             **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,
-                                *args,
+                                *_args,
                                 id=id,
                                 message=message,
                                 _configuration=_configuration,
@@ -11436,12 +20553,12 @@ class TestResponse(
             
                 def __new__(
                     cls,
-                    arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]]],
+                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]]],
                     _configuration: typing.Optional[schemas.Configuration] = None,
                 ) -> 'messages':
                     return super().__new__(
                         cls,
-                        arg,
+                        _arg,
                         _configuration=_configuration,
                     )
             
@@ -11454,36 +20571,36 @@ class TestResponse(
     messages: MetaOapg.properties.messages
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"messages\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"messages\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"messages\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"messages\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        messages: typing.Union[MetaOapg.properties.messages, tuple, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
+        messages: typing.Union[MetaOapg.properties.messages, list, tuple, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TestResponse':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             messages=messages,
             _configuration=_configuration,
             **kwargs,
@@ -11506,6 +20623,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11527,6 +20645,7 @@ class TestResponse(
         required = {
             \\"messages\\",
         }
+        
         class properties:
             
             
@@ -11547,6 +20666,7 @@ class TestResponse(
                             required = {
                                 \\"id\\",
                             }
+                            
                             class properties:
                                 message = schemas.StrSchema
                                 id = schemas.IntSchema
@@ -11558,43 +20678,43 @@ class TestResponse(
                         id: MetaOapg.properties.id
                         
                         @typing.overload
-                        def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+                        def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
                         
                         @typing.overload
-                        def __getitem__(self, name: typing.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
+                        def __getitem__(self, name: typing_extensions.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
                         
                         @typing.overload
                         def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
                         
-                        def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", \\"id\\", ], str]):
+                        def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", \\"id\\", ], str]):
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
                         
                         
                         @typing.overload
-                        def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
+                        def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
                         
                         @typing.overload
-                        def get_item_oapg(self, name: typing.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
+                        def get_item_oapg(self, name: typing_extensions.Literal[\\"id\\"]) -> MetaOapg.properties.id: ...
                         
                         @typing.overload
                         def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                         
-                        def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", \\"id\\", ], str]):
+                        def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", \\"id\\", ], str]):
                             return super().get_item_oapg(name)
                         
                     
                         def __new__(
                             cls,
-                            *args: typing.Union[dict, frozendict.frozendict, ],
-                            id: typing.Union[MetaOapg.properties.id, int, ],
+                            *_args: typing.Union[dict, frozendict.frozendict, ],
+                            id: typing.Union[MetaOapg.properties.id, decimal.Decimal, int, ],
                             message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
                             _configuration: typing.Optional[schemas.Configuration] = None,
                             **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,
-                                *args,
+                                *_args,
                                 id=id,
                                 message=message,
                                 _configuration=_configuration,
@@ -11603,12 +20723,12 @@ class TestResponse(
             
                 def __new__(
                     cls,
-                    arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]]],
+                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict.frozendict, ]]],
                     _configuration: typing.Optional[schemas.Configuration] = None,
                 ) -> 'messages':
                     return super().__new__(
                         cls,
-                        arg,
+                        _arg,
                         _configuration=_configuration,
                     )
             
@@ -11621,36 +20741,36 @@ class TestResponse(
     messages: MetaOapg.properties.messages
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"messages\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"messages\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"messages\\"]) -> MetaOapg.properties.messages: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"messages\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"messages\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        messages: typing.Union[MetaOapg.properties.messages, tuple, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
+        messages: typing.Union[MetaOapg.properties.messages, list, tuple, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TestResponse':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             messages=messages,
             _configuration=_configuration,
             **kwargs,
@@ -11664,7 +20784,7 @@ class TestResponse(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test.model.pet import Pet
+# from test.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -11703,6 +20823,7 @@ path = PathValues.ANYREQUESTRESPONSE",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -11713,6 +20834,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11759,19 +20881,67 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _any_request_response_oapg(
+        self,
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _any_request_response_oapg(
-        self: api_client.Api,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
-        content_type: str = 'application/json',
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+
+    @typing.overload
+    def _any_request_response_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _any_request_response_oapg(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _any_request_response_oapg(
+        self,
+        content_type: str = 'application/json',
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -11814,7 +20984,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -11822,18 +20996,67 @@ class BaseApi(api_client.Api):
 class AnyRequestResponse(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def any_request_response(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
-        content_type: str = 'application/json',
+        self,
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def any_request_response(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def any_request_response(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def any_request_response(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def any_request_response(
+        self,
+        content_type: str = 'application/json',
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._any_request_response_oapg(
             body=body,
             content_type=content_type,
@@ -11847,18 +21070,67 @@ class AnyRequestResponse(BaseApi):
 class ApiForput(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def put(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
-        content_type: str = 'application/json',
+        self,
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def put(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def put(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def put(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def put(
+        self,
+        content_type: str = 'application/json',
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._any_request_response_oapg(
             body=body,
             content_type=content_type,
@@ -11879,6 +21151,7 @@ class ApiForput(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -11889,6 +21162,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11897,26 +21171,100 @@ from test import schemas  # noqa: F401
 
 # body param
 SchemaForRequestBodyApplicationJson = schemas.AnyTypeSchema
+
+
+request_body_body = api_client.RequestBody(
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaForRequestBodyApplicationJson),
+    },
+)
 SchemaFor200ResponseBodyApplicationJson = schemas.AnyTypeSchema
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _any_request_response_oapg(
+        self,
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _any_request_response_oapg(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def _any_request_response_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _any_request_response_oapg(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def _any_request_response_oapg(
-        self: api_client.Api,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
+        self,
         content_type: str = 'application/json',
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -11959,7 +21307,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -11967,18 +21319,67 @@ class BaseApi(api_client.Api):
 class AnyRequestResponse(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def any_request_response(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
-        content_type: str = 'application/json',
+        self,
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def any_request_response(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def any_request_response(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def any_request_response(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def any_request_response(
+        self,
+        content_type: str = 'application/json',
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._any_request_response_oapg(
             body=body,
             content_type=content_type,
@@ -11992,18 +21393,67 @@ class AnyRequestResponse(BaseApi):
 class ApiForput(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def put(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
-        content_type: str = 'application/json',
+        self,
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def put(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def put(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def put(
+        self,
+        content_type: str = ...,
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def put(
+        self,
+        content_type: str = 'application/json',
+        body: typing.Union[SchemaForRequestBodyApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._any_request_response_oapg(
             body=body,
             content_type=content_type,
@@ -12031,6 +21481,7 @@ path = PathValues.DIFFERENTMEDIATYPE",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -12041,6 +21492,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -12088,19 +21540,67 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _media_types_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: typing_extensions.Literal[\\"application/pdf\\"] = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _media_types_oapg(
-        self: api_client.Api,
-        body: typing.Union[SchemaForRequestBodyApplicationPdf, bytes, io.FileIO, io.BufferedReader, ],
-        content_type: str = 'application/pdf',
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def _media_types_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _media_types_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _media_types_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = 'application/pdf',
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -12145,7 +21645,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -12153,18 +21657,67 @@ class BaseApi(api_client.Api):
 class MediaTypes(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
+    def media_types(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: typing_extensions.Literal[\\"application/pdf\\"] = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
     def media_types(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationPdf, bytes, io.FileIO, io.BufferedReader, ],
-        content_type: str = 'application/pdf',
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def media_types(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def media_types(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def media_types(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = 'application/pdf',
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._media_types_oapg(
             body=body,
             content_type=content_type,
@@ -12178,18 +21731,67 @@ class MediaTypes(BaseApi):
 class ApiForpost(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def post(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationPdf, bytes, io.FileIO, io.BufferedReader, ],
-        content_type: str = 'application/pdf',
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: typing_extensions.Literal[\\"application/pdf\\"] = ...,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = 'application/pdf',
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._media_types_oapg(
             body=body,
             content_type=content_type,
@@ -12210,6 +21812,7 @@ class ApiForpost(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -12220,6 +21823,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -12228,26 +21832,101 @@ from test import schemas  # noqa: F401
 
 # body param
 SchemaForRequestBodyApplicationPdf = schemas.BinarySchema
+
+
+request_body_body = api_client.RequestBody(
+    content={
+        'application/pdf': api_client.MediaType(
+            schema=SchemaForRequestBodyApplicationPdf),
+    },
+    required=True,
+)
 SchemaFor200ResponseBodyApplicationXMpegurl = schemas.StrSchema
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationXMpegurl,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/x-mpegurl': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationXMpegurl),
+    },
+)
 _all_accept_content_types = (
     'application/x-mpegurl',
 )
 
 
-class BaseApi(api_client.Api):
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _media_types_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: typing_extensions.Literal[\\"application/pdf\\"] = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _media_types_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def _media_types_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _media_types_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def _media_types_oapg(
-        self: api_client.Api,
-        body: typing.Union[SchemaForRequestBodyApplicationPdf, bytes, io.FileIO, io.BufferedReader, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
         content_type: str = 'application/pdf',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -12292,7 +21971,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -12300,18 +21983,67 @@ class BaseApi(api_client.Api):
 class MediaTypes(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def media_types(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationPdf, bytes, io.FileIO, io.BufferedReader, ],
-        content_type: str = 'application/pdf',
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: typing_extensions.Literal[\\"application/pdf\\"] = ...,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def media_types(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def media_types(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def media_types(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def media_types(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = 'application/pdf',
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._media_types_oapg(
             body=body,
             content_type=content_type,
@@ -12325,18 +22057,67 @@ class MediaTypes(BaseApi):
 class ApiForpost(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def post(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationPdf, bytes, io.FileIO, io.BufferedReader, ],
-        content_type: str = 'application/pdf',
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: typing_extensions.Literal[\\"application/pdf\\"] = ...,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = ...,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationPdf,bytes, io.FileIO, io.BufferedReader, ],
+        content_type: str = 'application/pdf',
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._media_types_oapg(
             body=body,
             content_type=content_type,
@@ -12364,6 +22145,7 @@ path = PathValues.EMPTYRESPONSE",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from test import api_client, exceptions
@@ -12373,6 +22155,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -12399,16 +22182,41 @@ _status_code_to_response = {
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _empty_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor204,
+    ]: ...
+
+    @typing.overload
+    def _empty_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
+    @typing.overload
     def _empty_oapg(
-        self: api_client.Api,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _empty_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -12434,7 +22242,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -12442,15 +22254,41 @@ class BaseApi(api_client.Api):
 class Empty(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def empty(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor204,
+    ]: ...
+
+    @typing.overload
+    def empty(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def empty(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def empty(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._empty_oapg(
             stream=stream,
             timeout=timeout,
@@ -12461,15 +22299,41 @@ class Empty(BaseApi):
 class ApiForput(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
+    def put(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor204,
+    ]: ...
+
+    @typing.overload
+    def put(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
     def put(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def put(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._empty_oapg(
             stream=stream,
             timeout=timeout,
@@ -12487,6 +22351,7 @@ class ApiForput(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from test import api_client, exceptions
@@ -12496,6 +22361,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -12504,17 +22370,54 @@ from test import schemas  # noqa: F401
 
 
 
+@dataclass
+class ApiResponseFor204(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_204 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor204,
+)
+
+
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _empty_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor204,
+    ]: ...
 
+    @typing.overload
     def _empty_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _empty_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _empty_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -12540,7 +22443,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -12548,15 +22455,41 @@ class BaseApi(api_client.Api):
 class Empty(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def empty(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor204,
+    ]: ...
+
+    @typing.overload
+    def empty(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def empty(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def empty(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._empty_oapg(
             stream=stream,
             timeout=timeout,
@@ -12567,15 +22500,41 @@ class Empty(BaseApi):
 class ApiForput(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def put(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor204,
+    ]: ...
+
+    @typing.overload
+    def put(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def put(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def put(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._empty_oapg(
             stream=stream,
             timeout=timeout,
@@ -12600,6 +22559,7 @@ path = PathValues.PATH_PATH_PARAM",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -12610,6 +22570,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -12622,7 +22583,7 @@ from test.model.test_request import TestRequest
 
 from . import path
 
-# query params
+# Query params
 Param1Schema = schemas.StrSchema
 
 
@@ -12636,12 +22597,12 @@ class Param2Schema(
 
     def __new__(
         cls,
-        arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]],
+        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]],
         _configuration: typing.Optional[schemas.Configuration] = None,
     ) -> 'Param2Schema':
         return super().__new__(
             cls,
-            arg,
+            _arg,
             _configuration=_configuration,
         )
 
@@ -12649,15 +22610,15 @@ class Param2Schema(
         return super().__getitem__(i)
 Param3Schema = schemas.NumberSchema
 Param4Schema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'param1': typing.Union[Param1Schema, str, ],
-        'param2': typing.Union[Param2Schema, tuple, ],
+        'param2': typing.Union[Param2Schema, list, tuple, ],
         'param3': typing.Union[Param3Schema, decimal.Decimal, int, float, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
         'param4': typing.Union[Param4Schema, str, ],
@@ -12697,15 +22658,15 @@ request_query_param4 = api_client.QueryParameter(
     schema=Param4Schema,
     explode=True,
 )
-# path params
+# Path params
 PathParamSchema = schemas.StrSchema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'pathParam': typing.Union[PathParamSchema, str, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
@@ -12781,22 +22742,78 @@ _all_accept_content_types = (
 )
 
 
-class BaseApi(api_client.Api):
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _operation_one_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _operation_one_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
 
+    @typing.overload
     def _operation_one_oapg(
-        self: api_client.Api,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
         query_params: RequestQueryParams = frozendict.frozendict(),
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _operation_one_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _operation_one_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -12872,7 +22889,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -12880,20 +22901,77 @@ class BaseApi(api_client.Api):
 class OperationOne(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def operation_one(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
         query_params: RequestQueryParams = frozendict.frozendict(),
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def operation_one(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def operation_one(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def operation_one(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def operation_one(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._operation_one_oapg(
             body=body,
             query_params=query_params,
@@ -12909,20 +22987,77 @@ class OperationOne(BaseApi):
 class ApiForpost(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def post(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
         query_params: RequestQueryParams = frozendict.frozendict(),
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._operation_one_oapg(
             body=body,
             query_params=query_params,
@@ -12945,6 +23080,7 @@ class ApiForpost(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -12955,6 +23091,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -12965,7 +23102,7 @@ from test.model.test_response import TestResponse
 from test.model.api_error import ApiError
 from test.model.test_request import TestRequest
 
-# query params
+# Query params
 Param1Schema = schemas.StrSchema
 
 
@@ -12977,48 +23114,221 @@ class Param2Schema(
     class MetaOapg:
         items = schemas.StrSchema
 
-    def __new__(
-        cls,
-        arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]],
-        _configuration: typing.Optional[schemas.Configuration] = None,
-    ) -> 'Param2Schema':
-        return super().__new__(
-            cls,
-            arg,
-            _configuration=_configuration,
-        )
+    def __new__(
+        cls,
+        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]],
+        _configuration: typing.Optional[schemas.Configuration] = None,
+    ) -> 'Param2Schema':
+        return super().__new__(
+            cls,
+            _arg,
+            _configuration=_configuration,
+        )
+
+    def __getitem__(self, i: int) -> MetaOapg.items:
+        return super().__getitem__(i)
+Param3Schema = schemas.NumberSchema
+Param4Schema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'param1': typing.Union[Param1Schema, str, ],
+        'param2': typing.Union[Param2Schema, list, tuple, ],
+        'param3': typing.Union[Param3Schema, decimal.Decimal, int, float, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+        'param4': typing.Union[Param4Schema, str, ],
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_param1 = api_client.QueryParameter(
+    name=\\"param1\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=Param1Schema,
+    required=True,
+    explode=True,
+)
+request_query_param2 = api_client.QueryParameter(
+    name=\\"param2\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=Param2Schema,
+    required=True,
+    explode=True,
+)
+request_query_param3 = api_client.QueryParameter(
+    name=\\"param3\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=Param3Schema,
+    required=True,
+    explode=True,
+)
+request_query_param4 = api_client.QueryParameter(
+    name=\\"param4\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=Param4Schema,
+    explode=True,
+)
+# Path params
+PathParamSchema = schemas.StrSchema
+RequestRequiredPathParams = typing_extensions.TypedDict(
+    'RequestRequiredPathParams',
+    {
+        'pathParam': typing.Union[PathParamSchema, str, ],
+    }
+)
+RequestOptionalPathParams = typing_extensions.TypedDict(
+    'RequestOptionalPathParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
+    pass
+
+
+request_path_path_param = api_client.PathParameter(
+    name=\\"pathParam\\",
+    style=api_client.ParameterStyle.SIMPLE,
+    schema=PathParamSchema,
+    required=True,
+)
+# body param
+SchemaForRequestBodyApplicationJson = TestRequest
+
+
+request_body_test_request = api_client.RequestBody(
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaForRequestBodyApplicationJson),
+    },
+    required=True,
+)
+SchemaFor200ResponseBodyApplicationJson = TestResponse
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiError
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
 
-    def __getitem__(self, i: int) -> MetaOapg.items:
-        return super().__getitem__(i)
-Param3Schema = schemas.NumberSchema
-Param4Schema = schemas.StrSchema
-# path params
-PathParamSchema = schemas.StrSchema
-# body param
-SchemaForRequestBodyApplicationJson = TestRequest
-SchemaFor200ResponseBodyApplicationJson = TestResponse
-SchemaFor400ResponseBodyApplicationJson = ApiError
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _operation_one_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _operation_one_oapg(
-        self: api_client.Api,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
         query_params: RequestQueryParams = frozendict.frozendict(),
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def _operation_one_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _operation_one_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _operation_one_oapg(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -13094,7 +23404,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -13102,20 +23416,77 @@ class BaseApi(api_client.Api):
 class OperationOne(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def operation_one(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
         query_params: RequestQueryParams = frozendict.frozendict(),
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def operation_one(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def operation_one(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def operation_one(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def operation_one(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._operation_one_oapg(
             body=body,
             query_params=query_params,
@@ -13131,20 +23502,77 @@ class OperationOne(BaseApi):
 class ApiForpost(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def post(
-        self: BaseApi,
-        body: typing.Union[SchemaForRequestBodyApplicationJson, ],
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: typing_extensions.Literal[\\"application/json\\"] = ...,
         query_params: RequestQueryParams = frozendict.frozendict(),
         path_params: RequestPathParams = frozendict.frozendict(),
-        content_type: str = 'application/json',
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        skip_deserialization: typing_extensions.Literal[True],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = ...,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def post(
+        self,
+        body: typing.Union[SchemaForRequestBodyApplicationJson,],
+        content_type: str = 'application/json',
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        path_params: RequestPathParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._operation_one_oapg(
             body=body,
             query_params=query_params,
@@ -13174,6 +23602,7 @@ path = PathValues.WITHOUTOPERATIONID",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -13184,6 +23613,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -13222,17 +23652,45 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _without_operation_id_delete_oapg(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _without_operation_id_delete_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _without_operation_id_delete_oapg(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _without_operation_id_delete_oapg(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -13264,7 +23722,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -13272,37 +23734,95 @@ class BaseApi(api_client.Api):
 class WithoutOperationIdDelete(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
-    def without_operation_id_delete(
-        self: BaseApi,
+    @typing.overload
+    def without_operation_id_delete(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def without_operation_id_delete(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def without_operation_id_delete(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def without_operation_id_delete(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._without_operation_id_delete_oapg(
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiFordelete(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def delete(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def delete(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def delete(
+        self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._without_operation_id_delete_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiFordelete(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def delete(
-        self: BaseApi,
+        self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         return self._without_operation_id_delete_oapg(
             accept_content_types=accept_content_types,
             stream=stream,
@@ -13321,6 +23841,7 @@ class ApiFordelete(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -13331,6 +23852,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -13340,23 +23862,69 @@ from test import schemas  # noqa: F401
 from test.model.test_response import TestResponse
 
 SchemaFor200ResponseBodyApplicationJson = TestResponse
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _without_operation_id_delete_oapg(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _without_operation_id_delete_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
+    @typing.overload
     def _without_operation_id_delete_oapg(
-        self: api_client.Api,
+        self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _without_operation_id_delete_oapg(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -13388,7 +23956,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -13396,16 +23968,45 @@ class BaseApi(api_client.Api):
 class WithoutOperationIdDelete(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def without_operation_id_delete(
-        self: BaseApi,
+        self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def without_operation_id_delete(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def without_operation_id_delete(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def without_operation_id_delete(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._without_operation_id_delete_oapg(
             accept_content_types=accept_content_types,
             stream=stream,
@@ -13417,16 +24018,45 @@ class WithoutOperationIdDelete(BaseApi):
 class ApiFordelete(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def delete(
-        self: BaseApi,
+        self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def delete(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def delete(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def delete(
+        self,
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._without_operation_id_delete_oapg(
             accept_content_types=accept_content_types,
             stream=stream,
@@ -13584,6 +24214,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -13707,6 +24338,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -13741,17 +24373,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -13839,14 +24471,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -13854,15 +24499,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -13875,9 +24520,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -13886,17 +24539,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -13935,8 +24586,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -13945,21 +24658,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -13969,6 +24669,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -14013,16 +24721,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -14039,7 +24747,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -14127,12 +24835,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -14141,14 +24849,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -14165,7 +24873,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -14183,17 +24891,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -14226,35 +24950,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -14276,7 +25204,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -14285,150 +25213,25 @@ class ValidatorBase:
                 additional_txt=additional_txt,
                 path_to_item=path_to_item,
             )
-        )
-
-
-class Validator(typing.Protocol):
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
+        )
+
 
-    return SchemaEnumMaker
+class EnumBase:
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -14496,7 +25299,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -14506,7 +25309,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -14521,14 +25324,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -14550,9 +25353,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -14616,9 +25419,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -14649,7 +25452,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -14678,7 +25481,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -14686,7 +25489,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -14744,7 +25547,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -14761,7 +25564,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -14782,7 +25585,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -14792,7 +25595,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -14802,7 +25605,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -14812,7 +25615,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -14855,6 +25658,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -14864,6 +25668,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -14879,7 +25684,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -14889,7 +25694,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -14900,7 +25705,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -14988,7 +25793,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -15003,21 +25808,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -15116,9 +25924,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -15126,6 +25932,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -15142,7 +25949,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -15152,7 +25959,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -15189,7 +25996,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -15214,6 +26021,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -15312,18 +26120,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -15374,8 +26175,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -15390,12 +26192,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -15414,6 +26217,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -15425,9 +26229,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -15478,7 +26283,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -15515,8 +26322,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -15538,13 +26346,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -15565,7 +26373,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -15575,12 +26382,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -15590,12 +26396,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -15606,14 +26411,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -15652,15 +26457,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -15671,10 +26494,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -15685,10 +26526,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -15697,17 +26556,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
 
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -15715,13 +26590,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -15734,34 +26608,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -15770,23 +26644,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -15805,8 +26679,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -15814,24 +26688,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -15841,14 +26715,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -15856,7 +26727,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -15881,18 +26752,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -15901,14 +26771,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -15925,8 +26795,7 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "test/test_models/__init__.py": "",
   "test/test_models/test_api_error.py": "# coding: utf-8
 
@@ -16049,7 +26918,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -16058,7 +26927,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -16306,9 +27175,10 @@ def test_hello(name, expected):
     assert hello(name) == expected
 ",
   "tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -16507,7 +27377,7 @@ test/schemas.py
 test/test_models/__init__.py
 tox.ini
 ",
-  ".openapi-generator/VERSION": "6.1.0",
+  ".openapi-generator/VERSION": "6.3.0",
   ".projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -16683,13 +27553,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -16730,6 +27598,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -16810,7 +27688,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test
 from pprint import pprint
-from test.apis import default_api
+from test.apis.tags import default_api
 # Defining the host is optional and defaults to http://localhost
 # See configuration.py for a list of all supported configuration parameters.
 configuration = test.Configuration(
@@ -16918,18 +27796,15 @@ This endpoint does not need any parameter.
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Ok
+200 | [ApiResponseFor200](#neither.ApiResponseFor200) | Ok
 
-#### ApiResponseFor200
+#### neither.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | Unset | body was not defined |
 headers | Unset | headers were not defined |
 
-
-void (empty response body)
-
 ### Authorization
 
 No authorization required
@@ -16984,18 +27859,15 @@ This endpoint does not need any parameter.
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Ok
+200 | [ApiResponseFor200](#tag1.ApiResponseFor200) | Ok
 
-#### ApiResponseFor200
+#### tag1.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | Unset | body was not defined |
 headers | Unset | headers were not defined |
 
-
-void (empty response body)
-
 ### Authorization
 
 No authorization required
@@ -17039,18 +27911,15 @@ This endpoint does not need any parameter.
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Ok
+200 | [ApiResponseFor200](#tag1_again.ApiResponseFor200) | Ok
 
-#### ApiResponseFor200
+#### tag1_again.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | Unset | body was not defined |
 headers | Unset | headers were not defined |
 
-
-void (empty response body)
-
 ### Authorization
 
 No authorization required
@@ -17104,18 +27973,15 @@ This endpoint does not need any parameter.
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Ok
+200 | [ApiResponseFor200](#tag2.ApiResponseFor200) | Ok
 
-#### ApiResponseFor200
+#### tag2.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | Unset | body was not defined |
 headers | Unset | headers were not defined |
 
-
-void (empty response body)
-
 ### Authorization
 
 No authorization required
@@ -17126,7 +27992,7 @@ No authorization required
   "git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -17185,11 +28051,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "setup.cfg": "[flake8]
 max-line-length=99
@@ -17217,10 +28084,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -17231,7 +28100,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Single Tags Test\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -17273,9 +28142,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -17305,6 +28175,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -17547,7 +28419,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -17576,8 +28448,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -17604,7 +28493,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -17651,8 +28539,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -17747,7 +28638,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -17765,7 +28656,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -17828,8 +28719,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -17868,12 +28757,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -17932,7 +28826,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -17961,7 +28855,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -17973,7 +28867,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -17989,7 +28883,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -18028,14 +28922,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -18052,23 +28946,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -18089,6 +28966,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -18108,13 +28998,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -18156,8 +29049,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -18227,7 +29120,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -18284,15 +29177,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -18304,7 +29200,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -18497,7 +29393,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -18569,9 +29465,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -18615,24 +29511,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -18688,7 +29584,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -18722,12 +29618,11 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "test/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "test/apis/path_to_api.py": "import typing
+  "test/apis/path_to_api.py": "import typing_extensions
 
 from test.paths import PathValues
 from test.apis.paths.tag1 import Tag1
@@ -18735,7 +29630,7 @@ from test.apis.paths.tag1_again import Tag1Again
 from test.apis.paths.tag2 import Tag2
 from test.apis.paths.neither import Neither
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.TAG1: Tag1,
@@ -18790,14 +29685,14 @@ class Tag2(
 ):
     pass
 ",
-  "test/apis/tag_to_api.py": "import typing
+  "test/apis/tag_to_api.py": "import typing_extensions
 
 from test.apis.tags import TagValues
 from test.apis.tags.default_api import DefaultApi
 from test.apis.tags.tag1_api import Tag1Api
 from test.apis.tags.tag2_api import Tag2Api
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -19429,14 +30324,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -19454,26 +30351,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -19807,6 +30684,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -19896,19 +30777,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -19948,7 +30836,7 @@ def render_path(path_to_item):
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test.model.pet import Pet
+# from test.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -19983,6 +30871,7 @@ path = PathValues.NEITHER",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from test import api_client, exceptions
@@ -19992,6 +30881,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -20018,16 +30908,41 @@ _status_code_to_response = {
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _neither_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -20053,7 +30968,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -20061,15 +30980,41 @@ class BaseApi(api_client.Api):
 class Neither(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def neither(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def neither(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def neither(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def neither(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._neither_oapg(
             stream=stream,
             timeout=timeout,
@@ -20080,15 +31025,41 @@ class Neither(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._neither_oapg(
             stream=stream,
             timeout=timeout,
@@ -20106,6 +31077,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from test import api_client, exceptions
@@ -20115,25 +31087,63 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
 
-from test import schemas  # noqa: F401
+from test import schemas  # noqa: F401
+
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
 
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _neither_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _neither_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -20159,7 +31169,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -20167,15 +31181,41 @@ class BaseApi(api_client.Api):
 class Neither(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def neither(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def neither(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def neither(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def neither(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._neither_oapg(
             stream=stream,
             timeout=timeout,
@@ -20186,15 +31226,41 @@ class Neither(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._neither_oapg(
             stream=stream,
             timeout=timeout,
@@ -20219,6 +31285,7 @@ path = PathValues.TAG1",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from test import api_client, exceptions
@@ -20228,6 +31295,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -20254,16 +31322,41 @@ _status_code_to_response = {
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _tag1_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -20289,7 +31382,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -20297,15 +31394,41 @@ class BaseApi(api_client.Api):
 class Tag1(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def tag1(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def tag1(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def tag1(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def tag1(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag1_oapg(
             stream=stream,
             timeout=timeout,
@@ -20316,15 +31439,41 @@ class Tag1(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag1_oapg(
             stream=stream,
             timeout=timeout,
@@ -20342,6 +31491,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from test import api_client, exceptions
@@ -20351,6 +31501,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -20359,17 +31510,54 @@ from test import schemas  # noqa: F401
 
 
 
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+
+
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _tag1_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _tag1_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -20395,7 +31583,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -20403,15 +31595,41 @@ class BaseApi(api_client.Api):
 class Tag1(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def tag1(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def tag1(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def tag1(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def tag1(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag1_oapg(
             stream=stream,
             timeout=timeout,
@@ -20422,15 +31640,41 @@ class Tag1(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag1_oapg(
             stream=stream,
             timeout=timeout,
@@ -20455,6 +31699,7 @@ path = PathValues.TAG1AGAIN",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from test import api_client, exceptions
@@ -20464,6 +31709,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -20490,16 +31736,41 @@ _status_code_to_response = {
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _tag1_again_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _tag1_again_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _tag1_again_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def _tag1_again_oapg(
-        self: api_client.Api,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -20525,7 +31796,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -20533,15 +31808,41 @@ class BaseApi(api_client.Api):
 class Tag1Again(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def tag1_again(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def tag1_again(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def tag1_again(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def tag1_again(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag1_again_oapg(
             stream=stream,
             timeout=timeout,
@@ -20552,15 +31853,41 @@ class Tag1Again(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag1_again_oapg(
             stream=stream,
             timeout=timeout,
@@ -20578,6 +31905,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from test import api_client, exceptions
@@ -20587,6 +31915,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -20595,17 +31924,54 @@ from test import schemas  # noqa: F401
 
 
 
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+
+
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _tag1_again_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _tag1_again_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _tag1_again_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _tag1_again_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -20631,7 +31997,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -20639,15 +32009,41 @@ class BaseApi(api_client.Api):
 class Tag1Again(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def tag1_again(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def tag1_again(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def tag1_again(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def tag1_again(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag1_again_oapg(
             stream=stream,
             timeout=timeout,
@@ -20658,15 +32054,41 @@ class Tag1Again(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag1_again_oapg(
             stream=stream,
             timeout=timeout,
@@ -20691,6 +32113,7 @@ path = PathValues.TAG2",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from test import api_client, exceptions
@@ -20700,6 +32123,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -20726,16 +32150,41 @@ _status_code_to_response = {
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _tag2_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -20761,7 +32210,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -20769,15 +32222,41 @@ class BaseApi(api_client.Api):
 class Tag2(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def tag2(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def tag2(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def tag2(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def tag2(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag2_oapg(
             stream=stream,
             timeout=timeout,
@@ -20788,15 +32267,41 @@ class Tag2(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag2_oapg(
             stream=stream,
             timeout=timeout,
@@ -20814,6 +32319,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from test import api_client, exceptions
@@ -20823,6 +32329,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -20831,17 +32338,54 @@ from test import schemas  # noqa: F401
 
 
 
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: schemas.Unset = schemas.unset
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+)
+
+
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _tag2_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
+    @typing.overload
     def _tag2_oapg(
-        self: api_client.Api,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _tag2_oapg(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -20867,23 +32411,53 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
 
-class Tag2(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
+class Tag2(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def tag2(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def tag2(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
+    @typing.overload
     def tag2(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def tag2(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag2_oapg(
             stream=stream,
             timeout=timeout,
@@ -20894,15 +32468,41 @@ class Tag2(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._tag2_oapg(
             stream=stream,
             timeout=timeout,
@@ -21059,6 +32659,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -21182,6 +32783,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -21216,17 +32818,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -21314,14 +32916,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -21329,15 +32944,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -21350,9 +32965,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -21361,17 +32984,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -21410,8 +33031,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -21420,21 +33103,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -21444,6 +33114,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -21488,16 +33166,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -21514,7 +33192,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -21602,12 +33280,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -21616,14 +33294,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -21640,7 +33318,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -21658,17 +33336,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -21701,35 +33395,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -21751,7 +33649,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -21763,147 +33661,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -21971,7 +33744,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -21981,7 +33754,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -21996,14 +33769,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -22025,9 +33798,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -22091,9 +33864,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -22124,7 +33897,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -22153,7 +33926,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -22161,7 +33934,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -22219,7 +33992,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -22236,7 +34009,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -22257,7 +34030,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -22267,7 +34040,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -22277,7 +34050,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -22287,7 +34060,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -22330,6 +34103,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -22339,6 +34113,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -22354,7 +34129,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -22364,7 +34139,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -22375,7 +34150,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -22463,7 +34238,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -22478,21 +34253,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -22591,9 +34369,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -22601,6 +34377,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -22617,7 +34394,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -22627,7 +34404,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -22664,7 +34441,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -22689,6 +34466,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -22787,18 +34565,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -22849,8 +34620,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -22865,12 +34637,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -22889,6 +34662,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -22900,9 +34674,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -22953,7 +34728,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -22990,8 +34767,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -23013,13 +34791,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -23040,7 +34818,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -23050,12 +34827,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -23065,12 +34841,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -23081,14 +34856,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -23127,15 +34902,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -23146,10 +34939,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -23160,10 +34971,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -23172,17 +35001,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
 
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -23190,13 +35035,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -23209,34 +35053,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -23245,23 +35089,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -23280,8 +35124,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -23289,24 +35133,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -23316,14 +35160,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -23331,7 +35172,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -23356,18 +35197,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -23376,14 +35216,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -23400,8 +35240,7 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "test/test_models/__init__.py": "",
   "test/test_paths/__init__.py": "import json
 import typing
@@ -23446,7 +35285,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -23455,7 +35294,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -23654,9 +35493,10 @@ def test_hello(name, expected):
     assert hello(name) == expected
 ",
   "tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
diff --git a/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-typescript-client-source-code.test.ts.snap b/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-typescript-client-source-code.test.ts.snap
index 810f0c1c9..da32e71aa 100644
--- a/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-typescript-client-source-code.test.ts.snap
+++ b/packages/open-api-gateway/test/project/codegen/components/__snapshots__/generated-typescript-client-source-code.test.ts.snap
@@ -593,7 +593,7 @@ src/runtime.ts
 tsconfig.esm.json
 tsconfig.json
 ",
-  ".openapi-generator/VERSION": "6.0.0",
+  ".openapi-generator/VERSION": "6.3.0",
   ".projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -1227,14 +1227,16 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiError,
+  TestRequest,
+  TestResponse,
+} from '../models';
 import {
-    ApiError,
     ApiErrorFromJSON,
     ApiErrorToJSON,
-    TestRequest,
     TestRequestFromJSON,
     TestRequestToJSON,
-    TestResponse,
     TestResponseFromJSON,
     TestResponseToJSON,
 } from '../models';
@@ -1251,7 +1253,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async someTestOperationRaw(requestParameters: SomeTestOperationRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<TestResponse>> {
+    async someTestOperationRaw(requestParameters: SomeTestOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<TestResponse>> {
         if (requestParameters.pathParam === null || requestParameters.pathParam === undefined) {
             throw new runtime.RequiredError('pathParam','Required parameter requestParameters.pathParam was null or undefined when calling someTestOperation.');
         }
@@ -1279,7 +1281,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async someTestOperation(requestParameters: SomeTestOperationRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<TestResponse> {
+    async someTestOperation(requestParameters: SomeTestOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<TestResponse> {
         const response = await this.someTestOperationRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -1604,6 +1606,16 @@ export interface ApiError {
 }
 
 
+/**
+ * Check if a given object implements the ApiError interface.
+ */
+export function instanceOfApiError(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorFromJSON(json: any): ApiError {
     return ApiErrorFromJSONTyped(json, false);
 }
@@ -1662,38 +1674,2429 @@ export interface TestRequest {
 }
 
 
+/**
+ * Check if a given object implements the TestRequest interface.
+ */
+export function instanceOfTestRequest(value: object): boolean {
+    let isInstance = true;
+
+    return isInstance;
+}
+
 export function TestRequestFromJSON(json: any): TestRequest {
     return TestRequestFromJSONTyped(json, false);
 }
 
-export function TestRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): TestRequest {
-    if ((json === undefined) || (json === null)) {
-        return json;
-    }
-    return {
-        
-        'myInput': !exists(json, 'myInput') ? undefined : json['myInput'],
-    };
-}
+export function TestRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): TestRequest {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'myInput': !exists(json, 'myInput') ? undefined : json['myInput'],
+    };
+}
+
+export function TestRequestToJSON(value?: TestRequest | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'myInput': value.myInput,
+    };
+}
+
+",
+  "src/models/TestResponse.ts": "/* tslint:disable */
+/* eslint-disable */
+/**
+ * Example API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+import type { TestResponseMessagesInner } from './TestResponseMessagesInner';
+import {
+    TestResponseMessagesInnerFromJSON,
+    TestResponseMessagesInnerFromJSONTyped,
+    TestResponseMessagesInnerToJSON,
+} from './TestResponseMessagesInner';
+
+/**
+ * 
+ * @export
+ * @interface TestResponse
+ */
+export interface TestResponse {
+    /**
+     * 
+     * @type {Array<TestResponseMessagesInner>}
+     * @memberof TestResponse
+     */
+    messages: Array<TestResponseMessagesInner>;
+}
+
+
+/**
+ * Check if a given object implements the TestResponse interface.
+ */
+export function instanceOfTestResponse(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"messages\\" in value;
+
+    return isInstance;
+}
+
+export function TestResponseFromJSON(json: any): TestResponse {
+    return TestResponseFromJSONTyped(json, false);
+}
+
+export function TestResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): TestResponse {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'messages': ((json['messages'] as Array<any>).map(TestResponseMessagesInnerFromJSON)),
+    };
+}
+
+export function TestResponseToJSON(value?: TestResponse | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'messages': ((value.messages as Array<any>).map(TestResponseMessagesInnerToJSON)),
+    };
+}
+
+",
+  "src/models/TestResponseMessagesInner.ts": "/* tslint:disable */
+/* eslint-disable */
+/**
+ * Example API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface TestResponseMessagesInner
+ */
+export interface TestResponseMessagesInner {
+    /**
+     * 
+     * @type {string}
+     * @memberof TestResponseMessagesInner
+     */
+    message?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof TestResponseMessagesInner
+     */
+    id: number;
+}
+
+
+/**
+ * Check if a given object implements the TestResponseMessagesInner interface.
+ */
+export function instanceOfTestResponseMessagesInner(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"id\\" in value;
+
+    return isInstance;
+}
+
+export function TestResponseMessagesInnerFromJSON(json: any): TestResponseMessagesInner {
+    return TestResponseMessagesInnerFromJSONTyped(json, false);
+}
+
+export function TestResponseMessagesInnerFromJSONTyped(json: any, ignoreDiscriminator: boolean): TestResponseMessagesInner {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'message': !exists(json, 'message') ? undefined : json['message'],
+        'id': json['id'],
+    };
+}
+
+export function TestResponseMessagesInnerToJSON(value?: TestResponseMessagesInner | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'message': value.message,
+        'id': value.id,
+    };
+}
+
+",
+  "src/models/index.ts": "/* tslint:disable */
+/* eslint-disable */
+export * from './ApiError';
+export * from './TestRequest';
+export * from './TestResponse';
+export * from './TestResponseMessagesInner';
+",
+  "src/runtime.ts": "/* tslint:disable */
+/* eslint-disable */
+/**
+ * Example API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export const BASE_PATH = \\"http://localhost\\".replace(/\\\\/+$/, \\"\\");
+
+export interface ConfigurationParameters {
+    basePath?: string; // override base path
+    fetchApi?: FetchAPI; // override for fetch implementation
+    middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
+    username?: string; // parameter for basic security
+    password?: string; // parameter for basic security
+    apiKey?: string | ((name: string) => string); // parameter for apiKey security
+    accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string | Promise<string>); // parameter for oauth2 security
+    headers?: HTTPHeaders; //header params we want to use on every request
+    credentials?: RequestCredentials; //value for the credentials param we want to use on each request
+}
+
+export class Configuration {
+    constructor(private configuration: ConfigurationParameters = {}) {}
+
+    set config(configuration: Configuration) {
+        this.configuration = configuration;
+    }
+
+    get basePath(): string {
+        return this.configuration.basePath != null ? this.configuration.basePath : BASE_PATH;
+    }
+
+    get fetchApi(): FetchAPI | undefined {
+        return this.configuration.fetchApi;
+    }
+
+    get middleware(): Middleware[] {
+        return this.configuration.middleware || [];
+    }
+
+    get queryParamsStringify(): (params: HTTPQuery) => string {
+        return this.configuration.queryParamsStringify || querystring;
+    }
+
+    get username(): string | undefined {
+        return this.configuration.username;
+    }
+
+    get password(): string | undefined {
+        return this.configuration.password;
+    }
+
+    get apiKey(): ((name: string) => string) | undefined {
+        const apiKey = this.configuration.apiKey;
+        if (apiKey) {
+            return typeof apiKey === 'function' ? apiKey : () => apiKey;
+        }
+        return undefined;
+    }
+
+    get accessToken(): ((name?: string, scopes?: string[]) => string | Promise<string>) | undefined {
+        const accessToken = this.configuration.accessToken;
+        if (accessToken) {
+            return typeof accessToken === 'function' ? accessToken : async () => accessToken;
+        }
+        return undefined;
+    }
+
+    get headers(): HTTPHeaders | undefined {
+        return this.configuration.headers;
+    }
+
+    get credentials(): RequestCredentials | undefined {
+        return this.configuration.credentials;
+    }
+}
+
+export const DefaultConfig = new Configuration();
+
+/**
+ * This is the base class for all generated API classes.
+ */
+export class BaseAPI {
+
+    private middleware: Middleware[];
+
+    constructor(protected configuration = DefaultConfig) {
+        this.middleware = configuration.middleware;
+    }
+
+    withMiddleware<T extends BaseAPI>(this: T, ...middlewares: Middleware[]) {
+        const next = this.clone<T>();
+        next.middleware = next.middleware.concat(...middlewares);
+        return next;
+    }
+
+    withPreMiddleware<T extends BaseAPI>(this: T, ...preMiddlewares: Array<Middleware['pre']>) {
+        const middlewares = preMiddlewares.map((pre) => ({ pre }));
+        return this.withMiddleware<T>(...middlewares);
+    }
+
+    withPostMiddleware<T extends BaseAPI>(this: T, ...postMiddlewares: Array<Middleware['post']>) {
+        const middlewares = postMiddlewares.map((post) => ({ post }));
+        return this.withMiddleware<T>(...middlewares);
+    }
+
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
+        const { url, init } = await this.createFetchParams(context, initOverrides);
+        const response = await this.fetchApi(url, init);
+        if (response && (response.status >= 200 && response.status < 300)) {
+            return response;
+        }
+        throw new ResponseError(response, 'Response returned an error code');
+    }
+
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
+        let url = this.configuration.basePath + context.path;
+        if (context.query !== undefined && Object.keys(context.query).length !== 0) {
+            // only add the querystring to the URL if there are query parameters.
+            // this is done to avoid urls ending with a \\"?\\" character which buggy webservers
+            // do not handle correctly sometimes.
+            url += '?' + this.configuration.queryParamsStringify(context.query);
+        }
+
+        const headers = Object.assign({}, this.configuration.headers, context.headers);
+        Object.keys(headers).forEach(key => headers[key] === undefined ? delete headers[key] : {});
+
+        const initOverrideFn =
+            typeof initOverrides === \\"function\\"
+                ? initOverrides
+                : async () => initOverrides;
+
+        const initParams = {
+            method: context.method,
+            headers,
+            body: context.body,
+            credentials: this.configuration.credentials,
+        };
+
+        const overriddenInit: RequestInit = {
+            ...initParams,
+            ...(await initOverrideFn({
+                init: initParams,
+                context,
+            }))
+        };
+
+        const init: RequestInit = {
+            ...overriddenInit,
+            body:
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
+        };
+
+        return { url, init };
+    }
+
+    private fetchApi = async (url: string, init: RequestInit) => {
+        let fetchParams = { url, init };
+        for (const middleware of this.middleware) {
+            if (middleware.pre) {
+                fetchParams = await middleware.pre({
+                    fetch: this.fetchApi,
+                    ...fetchParams,
+                }) || fetchParams;
+            }
+        }
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
+        for (const middleware of this.middleware) {
+            if (middleware.post) {
+                response = await middleware.post({
+                    fetch: this.fetchApi,
+                    url: fetchParams.url,
+                    init: fetchParams.init,
+                    response: response.clone(),
+                }) || response;
+            }
+        }
+        return response;
+    }
+
+    /**
+     * Create a shallow clone of \`this\` by constructing a new instance
+     * and then shallow cloning data members.
+     */
+    private clone<T extends BaseAPI>(this: T): T {
+        const constructor = this.constructor as any;
+        const next = new constructor(this.configuration);
+        next.middleware = this.middleware.slice();
+        return next;
+    }
+};
+
+function isBlob(value: any): value is Blob {
+    return typeof Blob !== 'undefined' && value instanceof Blob;
+}
+
+function isFormData(value: any): value is FormData {
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
+}
+
+export class ResponseError extends Error {
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
+    constructor(public response: Response, msg?: string) {
+        super(msg);
+    }
+}
+
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
+export class RequiredError extends Error {
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
+
+export const COLLECTION_FORMATS = {
+    csv: \\",\\",
+    ssv: \\" \\",
+    tsv: \\"\\\\t\\",
+    pipes: \\"|\\",
+};
+
+export type FetchAPI = WindowOrWorkerGlobalScope['fetch'];
+
+export type Json = any;
+export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'HEAD';
+export type HTTPHeaders = { [key: string]: string };
+export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
+export type HTTPBody = Json | FormData | URLSearchParams;
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
+export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
+
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+
+export interface FetchParams {
+    url: string;
+    init: RequestInit;
+}
+
+export interface RequestOpts {
+    path: string;
+    method: HTTPMethod;
+    headers: HTTPHeaders;
+    query?: HTTPQuery;
+    body?: HTTPBody;
+}
+
+export function exists(json: any, key: string) {
+    const value = json[key];
+    return value !== null && value !== undefined;
+}
+
+export function querystring(params: HTTPQuery, prefix: string = ''): string {
+    return Object.keys(params)
+        .map(key => querystringSingleKey(key, params[key], prefix))
+        .filter(part => part.length > 0)
+        .join('&');
+}
+
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+    const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
+    if (value instanceof Array) {
+        const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
+            .join(\`&\${encodeURIComponent(fullKey)}=\`);
+        return \`\${encodeURIComponent(fullKey)}=\${multiValue}\`;
+    }
+    if (value instanceof Set) {
+        const valueAsArray = Array.from(value);
+        return querystringSingleKey(key, valueAsArray, keyPrefix);
+    }
+    if (value instanceof Date) {
+        return \`\${encodeURIComponent(fullKey)}=\${encodeURIComponent(value.toISOString())}\`;
+    }
+    if (value instanceof Object) {
+        return querystring(value as HTTPQuery, fullKey);
+    }
+    return \`\${encodeURIComponent(fullKey)}=\${encodeURIComponent(String(value))}\`;
+}
+
+export function mapValues(data: any, fn: (item: any) => any) {
+  return Object.keys(data).reduce(
+    (acc, key) => ({ ...acc, [key]: fn(data[key]) }),
+    {}
+  );
+}
+
+export function canConsumeForm(consumes: Consume[]): boolean {
+    for (const consume of consumes) {
+        if ('multipart/form-data' === consume.contentType) {
+            return true;
+        }
+    }
+    return false;
+}
+
+export interface Consume {
+    contentType: string;
+}
+
+export interface RequestContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+}
+
+export interface ResponseContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    response: Response;
+}
+
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
+export interface Middleware {
+    pre?(context: RequestContext): Promise<FetchParams | void>;
+    post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
+}
+
+export interface ApiResponse<T> {
+    raw: Response;
+    value(): Promise<T>;
+}
+
+export interface ResponseTransformer<T> {
+    (json: any): T;
+}
+
+export class JSONApiResponse<T> {
+    constructor(public raw: Response, private transformer: ResponseTransformer<T> = (jsonValue: any) => jsonValue) {}
+
+    async value(): Promise<T> {
+        return this.transformer(await this.raw.json());
+    }
+}
+
+export class VoidApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<void> {
+        return undefined;
+    }
+}
+
+export class BlobApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<Blob> {
+        return await this.raw.blob();
+    };
+}
+
+export class TextApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<string> {
+        return await this.raw.text();
+    };
+}
+",
+  "test/hello.test.ts": "import { Hello } from '../src';
+
+test('hello', () => {
+  expect(new Hello().sayHello()).toBe('hello, world!');
+});",
+  "tsconfig.dev.json": Object {
+    "compilerOptions": Object {
+      "alwaysStrict": true,
+      "declaration": true,
+      "esModuleInterop": true,
+      "experimentalDecorators": true,
+      "inlineSourceMap": true,
+      "inlineSources": true,
+      "lib": Array [
+        "es2019",
+      ],
+      "module": "CommonJS",
+      "noEmitOnError": false,
+      "noFallthroughCasesInSwitch": true,
+      "noImplicitAny": true,
+      "noImplicitReturns": true,
+      "noImplicitThis": true,
+      "noUnusedLocals": true,
+      "noUnusedParameters": true,
+      "resolveJsonModule": true,
+      "strict": true,
+      "strictNullChecks": true,
+      "strictPropertyInitialization": true,
+      "stripInternal": true,
+      "target": "ES2019",
+    },
+    "exclude": Array [
+      "node_modules",
+    ],
+    "include": Array [
+      ".projenrc.js",
+      "src/**/*.ts",
+      "test/**/*.ts",
+    ],
+  },
+  "tsconfig.esm.json": Object {
+    "compilerOptions": Object {
+      "module": "esnext",
+      "outDir": "dist/esm",
+    },
+    "extends": "./tsconfig.json",
+  },
+  "tsconfig.json": Object {
+    "compilerOptions": Object {
+      "declaration": true,
+      "module": "commonjs",
+      "moduleResolution": "node",
+      "outDir": "dist",
+      "target": "es6",
+      "typeRoots": Array [
+        "node_modules/@types",
+      ],
+    },
+    "exclude": Array [
+      "dist",
+      "node_modules",
+    ],
+  },
+}
+`;
+
+exports[`Generated Typescript Client Code Unit Tests Multiple Tags 1`] = `
+Object {
+  ".eslintrc.json": Object {
+    "env": Object {
+      "jest": true,
+      "node": true,
+    },
+    "extends": Array [
+      "plugin:import/typescript",
+    ],
+    "ignorePatterns": Array [
+      "*.js",
+      "!.projenrc.js",
+      "*.d.ts",
+      "node_modules/",
+      "*.generated.ts",
+      "coverage",
+    ],
+    "overrides": Array [
+      Object {
+        "files": Array [
+          ".projenrc.js",
+        ],
+        "rules": Object {
+          "@typescript-eslint/no-require-imports": "off",
+          "import/no-extraneous-dependencies": "off",
+        },
+      },
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": Object {
+      "ecmaVersion": 2018,
+      "project": "./tsconfig.dev.json",
+      "sourceType": "module",
+    },
+    "plugins": Array [
+      "@typescript-eslint",
+      "import",
+    ],
+    "root": true,
+    "rules": Object {
+      "@typescript-eslint/indent": Array [
+        "error",
+        2,
+      ],
+      "@typescript-eslint/member-delimiter-style": Array [
+        "error",
+      ],
+      "@typescript-eslint/member-ordering": Array [
+        "error",
+        Object {
+          "default": Array [
+            "public-static-field",
+            "public-static-method",
+            "protected-static-field",
+            "protected-static-method",
+            "private-static-field",
+            "private-static-method",
+            "field",
+            "constructor",
+            "method",
+          ],
+        },
+      ],
+      "@typescript-eslint/no-floating-promises": Array [
+        "error",
+      ],
+      "@typescript-eslint/no-require-imports": Array [
+        "error",
+      ],
+      "@typescript-eslint/no-shadow": Array [
+        "error",
+      ],
+      "@typescript-eslint/return-await": Array [
+        "error",
+      ],
+      "array-bracket-newline": Array [
+        "error",
+        "consistent",
+      ],
+      "array-bracket-spacing": Array [
+        "error",
+        "never",
+      ],
+      "brace-style": Array [
+        "error",
+        "1tbs",
+        Object {
+          "allowSingleLine": true,
+        },
+      ],
+      "comma-dangle": Array [
+        "error",
+        "always-multiline",
+      ],
+      "comma-spacing": Array [
+        "error",
+        Object {
+          "after": true,
+          "before": false,
+        },
+      ],
+      "curly": Array [
+        "error",
+        "multi-line",
+        "consistent",
+      ],
+      "dot-notation": Array [
+        "error",
+      ],
+      "import/no-extraneous-dependencies": Array [
+        "error",
+        Object {
+          "devDependencies": Array [
+            "**/test/**",
+            "**/build-tools/**",
+          ],
+          "optionalDependencies": false,
+          "peerDependencies": true,
+        },
+      ],
+      "import/no-unresolved": Array [
+        "error",
+      ],
+      "import/order": Array [
+        "warn",
+        Object {
+          "alphabetize": Object {
+            "caseInsensitive": true,
+            "order": "asc",
+          },
+          "groups": Array [
+            "builtin",
+            "external",
+          ],
+        },
+      ],
+      "indent": Array [
+        "off",
+      ],
+      "key-spacing": Array [
+        "error",
+      ],
+      "keyword-spacing": Array [
+        "error",
+      ],
+      "max-len": Array [
+        "error",
+        Object {
+          "code": 150,
+          "ignoreComments": true,
+          "ignoreRegExpLiterals": true,
+          "ignoreStrings": true,
+          "ignoreTemplateLiterals": true,
+          "ignoreUrls": true,
+        },
+      ],
+      "no-bitwise": Array [
+        "error",
+      ],
+      "no-duplicate-imports": Array [
+        "error",
+      ],
+      "no-multi-spaces": Array [
+        "error",
+        Object {
+          "ignoreEOLComments": false,
+        },
+      ],
+      "no-multiple-empty-lines": Array [
+        "error",
+      ],
+      "no-return-await": Array [
+        "off",
+      ],
+      "no-shadow": Array [
+        "off",
+      ],
+      "no-trailing-spaces": Array [
+        "error",
+      ],
+      "object-curly-newline": Array [
+        "error",
+        Object {
+          "consistent": true,
+          "multiline": true,
+        },
+      ],
+      "object-curly-spacing": Array [
+        "error",
+        "always",
+      ],
+      "object-property-newline": Array [
+        "error",
+        Object {
+          "allowAllPropertiesOnSameLine": true,
+        },
+      ],
+      "quote-props": Array [
+        "error",
+        "consistent-as-needed",
+      ],
+      "quotes": Array [
+        "error",
+        "single",
+        Object {
+          "avoidEscape": true,
+        },
+      ],
+      "semi": Array [
+        "error",
+        "always",
+      ],
+      "space-before-blocks": Array [
+        "error",
+      ],
+    },
+    "settings": Object {
+      "import/parsers": Object {
+        "@typescript-eslint/parser": Array [
+          ".ts",
+          ".tsx",
+        ],
+      },
+      "import/resolver": Object {
+        "node": Object {},
+        "typescript": Object {
+          "alwaysTryTypes": true,
+          "project": "./tsconfig.dev.json",
+        },
+      },
+    },
+  },
+  ".gitattributes": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+
+*.snap linguist-generated
+/.eslintrc.json linguist-generated
+/.gitattributes linguist-generated
+/.github/pull_request_template.md linguist-generated
+/.github/workflows/build.yml linguist-generated
+/.github/workflows/pull-request-lint.yml linguist-generated
+/.github/workflows/release.yml linguist-generated
+/.github/workflows/upgrade-main.yml linguist-generated
+/.gitignore linguist-generated
+/.mergify.yml linguist-generated
+/.npmignore linguist-generated
+/.projen/** linguist-generated
+/.projen/deps.json linguist-generated
+/.projen/files.json linguist-generated
+/.projen/tasks.json linguist-generated
+/LICENSE linguist-generated
+/package.json linguist-generated
+/tsconfig.dev.json linguist-generated
+/tsconfig.json linguist-generated
+/yarn.lock linguist-generated",
+  ".github/pull_request_template.md": "Fixes #",
+  ".github/workflows/build.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+
+name: build
+on:
+  pull_request: {}
+  workflow_dispatch: {}
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    outputs:
+      self_mutation_happened: \${{ steps.self_mutation.outputs.self_mutation_happened }}
+    env:
+      CI: \\"true\\"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: \${{ github.event.pull_request.head.ref }}
+          repository: \${{ github.event.pull_request.head.repo.full_name }}
+      - name: Install dependencies
+        run: yarn install --check-files
+      - name: build
+        run: npx projen build
+      - name: Find mutations
+        id: self_mutation
+        run: |-
+          git add .
+          git diff --staged --patch --exit-code > .repo.patch || echo \\"self_mutation_happened=true\\" >> $GITHUB_OUTPUT
+      - name: Upload patch
+        if: steps.self_mutation.outputs.self_mutation_happened
+        uses: actions/upload-artifact@v3
+        with:
+          name: .repo.patch
+          path: .repo.patch
+      - name: Fail build on mutation
+        if: steps.self_mutation.outputs.self_mutation_happened
+        run: |-
+          echo \\"::error::Files were changed during build (see build log). If this was triggered from a fork, you will need to update your branch.\\"
+          cat .repo.patch
+          exit 1
+  self-mutation:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    if: always() && needs.build.outputs.self_mutation_happened && !(github.event.pull_request.head.repo.full_name != github.repository)
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          token: \${{ secrets.PROJEN_GITHUB_TOKEN }}
+          ref: \${{ github.event.pull_request.head.ref }}
+          repository: \${{ github.event.pull_request.head.repo.full_name }}
+      - name: Download patch
+        uses: actions/download-artifact@v3
+        with:
+          name: .repo.patch
+          path: \${{ runner.temp }}
+      - name: Apply patch
+        run: '[ -s \${{ runner.temp }}/.repo.patch ] && git apply \${{ runner.temp }}/.repo.patch || echo \\"Empty patch. Skipping.\\"'
+      - name: Set git identity
+        run: |-
+          git config user.name \\"github-actions\\"
+          git config user.email \\"github-actions@github.com\\"
+      - name: Push changes
+        run: |2-
+            git add .
+            git commit -s -m \\"chore: self mutation\\"
+            git push origin HEAD:\${{ github.event.pull_request.head.ref }}
+",
+  ".github/workflows/pull-request-lint.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+
+name: pull-request-lint
+on:
+  pull_request_target:
+    types:
+      - labeled
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+      - edited
+jobs:
+  validate:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5.0.2
+        env:
+          GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }}
+        with:
+          types: |-
+            feat
+            fix
+            chore
+          requireScope: false
+",
+  ".github/workflows/release.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+
+name: release
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch: {}
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    outputs:
+      latest_commit: \${{ steps.git_remote.outputs.latest_commit }}
+    env:
+      CI: \\"true\\"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set git identity
+        run: |-
+          git config user.name \\"github-actions\\"
+          git config user.email \\"github-actions@github.com\\"
+      - name: Install dependencies
+        run: yarn install --check-files --frozen-lockfile
+      - name: release
+        run: npx projen release
+      - name: Check for new commits
+        id: git_remote
+        run: echo \\"latest_commit=$(git ls-remote origin -h \${{ github.ref }} | cut -f1)\\" >> $GITHUB_OUTPUT
+      - name: Backup artifact permissions
+        if: \${{ steps.git_remote.outputs.latest_commit == github.sha }}
+        run: cd dist && getfacl -R . > permissions-backup.acl
+        continue-on-error: true
+      - name: Upload artifact
+        if: \${{ steps.git_remote.outputs.latest_commit == github.sha }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-artifact
+          path: dist
+  release_github:
+    name: Publish to GitHub Releases
+    needs: release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    if: needs.release.outputs.latest_commit == github.sha
+    steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14.x
+      - name: Download build artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: build-artifact
+          path: dist
+      - name: Restore build artifact permissions
+        run: cd dist && setfacl --restore=permissions-backup.acl
+        continue-on-error: true
+      - name: Release
+        env:
+          GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY: \${{ github.repository }}
+          GITHUB_REF: \${{ github.ref }}
+        run: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q \\"Release.tag_name already exists\\" $errout; then cat $errout; exit $exitcode; fi
+",
+  ".github/workflows/upgrade-main.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+
+name: upgrade-main
+on:
+  workflow_dispatch: {}
+  schedule:
+    - cron: 0 0 * * *
+jobs:
+  upgrade:
+    name: Upgrade
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      patch_created: \${{ steps.create_patch.outputs.patch_created }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: main
+      - name: Install dependencies
+        run: yarn install --check-files --frozen-lockfile
+      - name: Upgrade dependencies
+        run: npx projen upgrade
+      - name: Find mutations
+        id: create_patch
+        run: |-
+          git add .
+          git diff --staged --patch --exit-code > .repo.patch || echo \\"patch_created=true\\" >> $GITHUB_OUTPUT
+      - name: Upload patch
+        if: steps.create_patch.outputs.patch_created
+        uses: actions/upload-artifact@v3
+        with:
+          name: .repo.patch
+          path: .repo.patch
+  pr:
+    name: Create Pull Request
+    needs: upgrade
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    if: \${{ needs.upgrade.outputs.patch_created }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: main
+      - name: Download patch
+        uses: actions/download-artifact@v3
+        with:
+          name: .repo.patch
+          path: \${{ runner.temp }}
+      - name: Apply patch
+        run: '[ -s \${{ runner.temp }}/.repo.patch ] && git apply \${{ runner.temp }}/.repo.patch || echo \\"Empty patch. Skipping.\\"'
+      - name: Set git identity
+        run: |-
+          git config user.name \\"github-actions\\"
+          git config user.email \\"github-actions@github.com\\"
+      - name: Create Pull Request
+        id: create-pr
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: \${{ secrets.PROJEN_GITHUB_TOKEN }}
+          commit-message: |-
+            chore(deps): upgrade dependencies
+
+            Upgrades project dependencies. See details in [workflow run].
+
+            [Workflow Run]: https://github.com/\${{ github.repository }}/actions/runs/\${{ github.run_id }}
+
+            ------
+
+            *Automatically created by projen via the \\"upgrade-main\\" workflow*
+          branch: github-actions/upgrade-main
+          title: \\"chore(deps): upgrade dependencies\\"
+          body: |-
+            Upgrades project dependencies. See details in [workflow run].
+
+            [Workflow Run]: https://github.com/\${{ github.repository }}/actions/runs/\${{ github.run_id }}
+
+            ------
+
+            *Automatically created by projen via the \\"upgrade-main\\" workflow*
+          author: github-actions <github-actions@github.com>
+          committer: github-actions <github-actions@github.com>
+          signoff: true
+",
+  ".gitignore": "wwwroot/*.js
+node_modules
+typings
+dist
+",
+  ".mergify.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
+
+queue_rules:
+  - name: default
+    conditions:
+      - \\"#approved-reviews-by>=1\\"
+      - -label~=(do-not-merge)
+      - status-success=build
+pull_request_rules:
+  - name: Automatic merge on approval and successful build
+    actions:
+      delete_head_branch: {}
+      queue:
+        method: squash
+        name: default
+        commit_message_template: |-
+          {{ title }} (#{{ number }})
+
+          {{ body }}
+    conditions:
+      - \\"#approved-reviews-by>=1\\"
+      - -label~=(do-not-merge)
+      - status-success=build
+",
+  ".npmignore": "README.md",
+  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
+",
+  ".openapi-generator/FILES": ".gitignore
+.npmignore
+.openapi-generator-ignore
+README.md
+package.json
+src/apis/DefaultApi.ts
+src/apis/DefaultApi/OperationConfig.ts
+src/apis/Tag1Api.ts
+src/apis/Tag2Api.ts
+src/apis/index.ts
+src/index.ts
+src/runtime.ts
+tsconfig.esm.json
+tsconfig.json
+",
+  ".openapi-generator/VERSION": "6.3.0",
+  ".projen/deps.json": Object {
+    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
+    "dependencies": Array [
+      Object {
+        "name": "@types/jest",
+        "type": "build",
+      },
+      Object {
+        "name": "@types/node",
+        "type": "build",
+        "version": "^14",
+      },
+      Object {
+        "name": "@typescript-eslint/eslint-plugin",
+        "type": "build",
+        "version": "^5",
+      },
+      Object {
+        "name": "@typescript-eslint/parser",
+        "type": "build",
+        "version": "^5",
+      },
+      Object {
+        "name": "eslint-import-resolver-node",
+        "type": "build",
+      },
+      Object {
+        "name": "eslint-import-resolver-typescript",
+        "type": "build",
+      },
+      Object {
+        "name": "eslint-plugin-import",
+        "type": "build",
+      },
+      Object {
+        "name": "eslint",
+        "type": "build",
+        "version": "^8",
+      },
+      Object {
+        "name": "jest",
+        "type": "build",
+      },
+      Object {
+        "name": "jest-junit",
+        "type": "build",
+        "version": "^13",
+      },
+      Object {
+        "name": "npm-check-updates",
+        "type": "build",
+        "version": "^16",
+      },
+      Object {
+        "name": "projen",
+        "type": "build",
+      },
+      Object {
+        "name": "standard-version",
+        "type": "build",
+        "version": "^9",
+      },
+      Object {
+        "name": "ts-jest",
+        "type": "build",
+      },
+      Object {
+        "name": "typescript",
+        "type": "build",
+      },
+    ],
+  },
+  ".projen/files.json": Object {
+    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
+    "files": Array [
+      ".eslintrc.json",
+      ".gitattributes",
+      ".github/pull_request_template.md",
+      ".github/workflows/build.yml",
+      ".github/workflows/pull-request-lint.yml",
+      ".github/workflows/release.yml",
+      ".github/workflows/upgrade-main.yml",
+      ".gitignore",
+      ".mergify.yml",
+      ".npmignore",
+      ".projen/deps.json",
+      ".projen/files.json",
+      ".projen/tasks.json",
+      "LICENSE",
+      "tsconfig.dev.json",
+      "tsconfig.json",
+    ],
+  },
+  ".projen/tasks.json": Object {
+    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
+    "env": Object {
+      "PATH": "$(npx -c \\"node -e \\\\\\"console.log(process.env.PATH)\\\\\\"\\")",
+    },
+    "tasks": Object {
+      "build": Object {
+        "description": "Full release build",
+        "name": "build",
+        "steps": Array [
+          Object {
+            "spawn": "default",
+          },
+          Object {
+            "spawn": "pre-compile",
+          },
+          Object {
+            "spawn": "compile",
+          },
+          Object {
+            "spawn": "post-compile",
+          },
+          Object {
+            "spawn": "test",
+          },
+          Object {
+            "spawn": "package",
+          },
+        ],
+      },
+      "bump": Object {
+        "condition": "! git log --oneline -1 | grep -q \\"chore(release):\\"",
+        "description": "Bumps version based on latest git tag and generates a changelog entry",
+        "env": Object {
+          "BUMPFILE": "dist/version.txt",
+          "CHANGELOG": "dist/changelog.md",
+          "OUTFILE": "package.json",
+          "RELEASETAG": "dist/releasetag.txt",
+          "RELEASE_TAG_PREFIX": "",
+        },
+        "name": "bump",
+        "steps": Array [
+          Object {
+            "builtin": "release/bump-version",
+          },
+        ],
+      },
+      "clobber": Object {
+        "condition": "git diff --exit-code > /dev/null",
+        "description": "hard resets to HEAD of origin and cleans the local repo",
+        "env": Object {
+          "BRANCH": "$(git branch --show-current)",
+        },
+        "name": "clobber",
+        "steps": Array [
+          Object {
+            "exec": "git checkout -b scratch",
+            "name": "save current HEAD in \\"scratch\\" branch",
+          },
+          Object {
+            "exec": "git checkout $BRANCH",
+          },
+          Object {
+            "exec": "git fetch origin",
+            "name": "fetch latest changes from origin",
+          },
+          Object {
+            "exec": "git reset --hard origin/$BRANCH",
+            "name": "hard reset to origin commit",
+          },
+          Object {
+            "exec": "git clean -fdx",
+            "name": "clean all untracked files",
+          },
+          Object {
+            "say": "ready to rock! (unpushed commits are under the \\"scratch\\" branch)",
+          },
+        ],
+      },
+      "compile": Object {
+        "description": "Only compile",
+        "name": "compile",
+        "steps": Array [
+          Object {
+            "exec": "tsc --build",
+          },
+        ],
+      },
+      "default": Object {
+        "description": "Synthesize project files",
+        "name": "default",
+        "steps": Array [
+          Object {
+            "exec": "node .projenrc.js",
+          },
+        ],
+      },
+      "eject": Object {
+        "description": "Remove projen from the project",
+        "env": Object {
+          "PROJEN_EJECTING": "true",
+        },
+        "name": "eject",
+        "steps": Array [
+          Object {
+            "spawn": "default",
+          },
+        ],
+      },
+      "eslint": Object {
+        "description": "Runs eslint against the codebase",
+        "name": "eslint",
+        "steps": Array [
+          Object {
+            "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test build-tools .projenrc.js",
+          },
+        ],
+      },
+      "package": Object {
+        "description": "Creates the distribution package",
+        "name": "package",
+        "steps": Array [
+          Object {
+            "exec": "mkdir -p dist/js",
+          },
+          Object {
+            "exec": "mv $(npm pack) dist/js/",
+          },
+        ],
+      },
+      "post-compile": Object {
+        "description": "Runs after successful compilation",
+        "name": "post-compile",
+      },
+      "post-upgrade": Object {
+        "description": "Runs after upgrading dependencies",
+        "name": "post-upgrade",
+      },
+      "pre-compile": Object {
+        "description": "Prepare the project for compilation",
+        "name": "pre-compile",
+      },
+      "release": Object {
+        "description": "Prepare a release from \\"main\\" branch",
+        "env": Object {
+          "RELEASE": "true",
+        },
+        "name": "release",
+        "steps": Array [
+          Object {
+            "exec": "rm -fr dist",
+          },
+          Object {
+            "spawn": "bump",
+          },
+          Object {
+            "spawn": "build",
+          },
+          Object {
+            "spawn": "unbump",
+          },
+          Object {
+            "exec": "git diff --ignore-space-at-eol --exit-code",
+          },
+        ],
+      },
+      "test": Object {
+        "description": "Run tests",
+        "name": "test",
+        "steps": Array [
+          Object {
+            "exec": "jest --passWithNoTests --updateSnapshot",
+            "receiveArgs": true,
+          },
+          Object {
+            "spawn": "eslint",
+          },
+        ],
+      },
+      "test:watch": Object {
+        "description": "Run jest in watch mode",
+        "name": "test:watch",
+        "steps": Array [
+          Object {
+            "exec": "jest --watch",
+          },
+        ],
+      },
+      "unbump": Object {
+        "description": "Restores version to 0.0.0",
+        "env": Object {
+          "BUMPFILE": "dist/version.txt",
+          "CHANGELOG": "dist/changelog.md",
+          "OUTFILE": "package.json",
+          "RELEASETAG": "dist/releasetag.txt",
+          "RELEASE_TAG_PREFIX": "",
+        },
+        "name": "unbump",
+        "steps": Array [
+          Object {
+            "builtin": "release/reset-version",
+          },
+        ],
+      },
+      "upgrade": Object {
+        "description": "upgrade dependencies",
+        "env": Object {
+          "CI": "0",
+        },
+        "name": "upgrade",
+        "steps": Array [
+          Object {
+            "exec": "yarn upgrade npm-check-updates",
+          },
+          Object {
+            "exec": "npm-check-updates --dep dev --upgrade --target=minor",
+          },
+          Object {
+            "exec": "npm-check-updates --dep optional --upgrade --target=minor",
+          },
+          Object {
+            "exec": "npm-check-updates --dep peer --upgrade --target=minor",
+          },
+          Object {
+            "exec": "npm-check-updates --dep prod --upgrade --target=minor",
+          },
+          Object {
+            "exec": "npm-check-updates --dep bundle --upgrade --target=minor",
+          },
+          Object {
+            "exec": "yarn install --check-files",
+          },
+          Object {
+            "exec": "yarn upgrade",
+          },
+          Object {
+            "exec": "npx projen",
+          },
+          Object {
+            "spawn": "post-upgrade",
+          },
+        ],
+      },
+      "watch": Object {
+        "description": "Watch & compile in the background",
+        "name": "watch",
+        "steps": Array [
+          Object {
+            "exec": "tsc --build -w",
+          },
+        ],
+      },
+    },
+  },
+  "LICENSE": "
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      \\"License\\" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      \\"Licensor\\" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      \\"Legal Entity\\" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      \\"control\\" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      \\"You\\" (or \\"Your\\") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      \\"Source\\" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      \\"Object\\" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      \\"Work\\" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      \\"Derivative Works\\" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      \\"Contribution\\" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, \\"submitted\\"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as \\"Not a Contribution.\\"
+
+      \\"Contributor\\" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a \\"NOTICE\\" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an \\"AS IS\\" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets \\"[]\\"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same \\"printed page\\" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the \\"License\\");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an \\"AS IS\\" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+",
+  "README.md": "## test@1.0.0
+
+This generator creates TypeScript/JavaScript client that utilizes [Fetch API](https://fetch.spec.whatwg.org/). The generated Node module can be used in the following environments:
+
+Environment
+* Node.js
+* Webpack
+* Browserify
+
+Language level
+* ES5 - you must have a Promises/A+ library installed
+* ES6
+
+Module system
+* CommonJS
+* ES6 module system
+
+It can be used in both TypeScript and JavaScript. In TypeScript, the definition should be automatically resolved via \`package.json\`. ([Reference](http://www.typescriptlang.org/docs/handbook/typings-for-npm-packages.html))
+
+### Building
+
+To build and compile the typescript sources to javascript use:
+\`\`\`
+npm install
+npm run build
+\`\`\`
+
+### Publishing
+
+First build the package then run \`\`\`npm publish\`\`\`
+
+### Consuming
+
+navigate to the folder of your consuming project and run one of the following commands.
+
+_published:_
+
+\`\`\`
+npm install test@1.0.0 --save
+\`\`\`
+
+_unPublished (not recommended):_
+
+\`\`\`
+npm install PATH_TO_GENERATED_PACKAGE --save
+",
+  "package.json": Object {
+    "author": "OpenAPI-Generator",
+    "description": "OpenAPI client for test",
+    "devDependencies": Object {
+      "typescript": "^4.0",
+    },
+    "main": "./dist/index.js",
+    "module": "./dist/esm/index.js",
+    "name": "test",
+    "repository": Object {
+      "type": "git",
+      "url": "https://github.com/GIT_USER_ID/GIT_REPO_ID.git",
+    },
+    "scripts": Object {
+      "build": "tsc && tsc -p tsconfig.esm.json",
+      "prepare": "npm run build",
+    },
+    "sideEffects": false,
+    "typings": "./dist/index.d.ts",
+    "version": "1.0.0",
+  },
+  "src/apis/DefaultApi.ts": "/* tslint:disable */
+/* eslint-disable */
+/**
+ * Multiple Tags Test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+
+/**
+ * 
+ */
+export class DefaultApi extends runtime.BaseAPI {
+
+    /**
+     */
+    async neitherRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: \`/neither\`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     */
+    async neither(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.neitherRaw(initOverrides);
+    }
+
+}
+",
+  "src/apis/DefaultApi/OperationConfig.ts": "// Import models
+import {
+} from '../../models';
+// Import request parameter interfaces
+import {
+    
+    
+    
+    
+} from '..';
+
+// API Gateway Types
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from \\"aws-lambda\\";
+
+// Generic type for object keyed by operation names
+export interface OperationConfig<T> {
+    neither: T;
+    both: T;
+    tag1: T;
+    tag2: T;
+}
+
+// Look up path and http method for a given operation name
+export const OperationLookup = {
+    neither: {
+        path: '/neither',
+        method: 'GET',
+    },
+    both: {
+        path: '/both',
+        method: 'GET',
+    },
+    tag1: {
+        path: '/tag1',
+        method: 'GET',
+    },
+    tag2: {
+        path: '/tag2',
+        method: 'GET',
+    },
+};
+
+export class Operations {
+  /**
+   * Return an OperationConfig with the same value for every operation
+   */
+  public static all = <T>(value: T): OperationConfig<T> => Object.fromEntries(
+    Object.keys(OperationLookup).map((operationId) => [operationId, value])
+  ) as unknown as OperationConfig<T>;
+}
+
+// Standard apigateway request parameters (query parameters or path parameters, multi or single value)
+type ApiGatewayRequestParameters = { [key: string]: string | string[] | undefined };
+
+/**
+ * URI decode for a string or array of strings
+ */
+const uriDecode = (value: string | string[]): string | string[] =>
+    typeof value === 'string' ? decodeURIComponent(value) : value.map((v) => decodeURIComponent(v));
+
+/**
+ * URI decodes apigateway request parameters (query or path parameters)
+ */
+const decodeRequestParameters = (parameters: ApiGatewayRequestParameters): ApiGatewayRequestParameters => {
+    const decodedParameters = {};
+    Object.keys(parameters || {}).forEach((key) => {
+        decodedParameters[key] = parameters[key] ? uriDecode(parameters[key]) : parameters[key];
+    });
+    return decodedParameters;
+};
+
+/**
+ * Parse the body if the content type is json, otherwise leave as a raw string
+ */
+const parseBody = (body: string, demarshal: (body: string) => any, contentTypes: string[]): any => contentTypes.filter((contentType) => contentType !== 'application/json').length === 0 ? demarshal(body || '{}') : body;
+
+type OperationIds = | 'neither' | 'both' | 'tag1' | 'tag2';
+type OperationApiGatewayProxyResult<T extends OperationIds> = APIGatewayProxyResult & { __operationId?: T };
+
+// Api gateway lambda handler type
+type OperationApiGatewayLambdaHandler<T extends OperationIds> = (event: APIGatewayProxyEvent, context: Context) => Promise<OperationApiGatewayProxyResult<T>>;
+
+// Type of the response to be returned by an operation lambda handler
+export interface OperationResponse<StatusCode extends number, Body> {
+    statusCode: StatusCode;
+    headers?: { [key: string]: string };
+    body: Body;
+}
+
+// Input for a lambda handler for an operation
+export type LambdaRequestParameters<RequestParameters, RequestArrayParameters, RequestBody> = {
+    requestParameters: RequestParameters,
+    requestArrayParameters: RequestArrayParameters,
+    body: RequestBody,
+};
+
+export type InterceptorContext = { [key: string]: any };
+
+export interface RequestInput<RequestParameters, RequestArrayParameters, RequestBody> {
+    input: LambdaRequestParameters<RequestParameters, RequestArrayParameters, RequestBody>;
+    event: APIGatewayProxyEvent;
+    context: Context;
+    interceptorContext: InterceptorContext;
+}
+
+export interface ChainedRequestInput<RequestParameters, RequestArrayParameters, RequestBody, Response> extends RequestInput<RequestParameters, RequestArrayParameters, RequestBody> {
+    chain: LambdaHandlerChain<RequestParameters, RequestArrayParameters, RequestBody, Response>;
+}
+
+/**
+ * A lambda handler function which is part of a chain. It may invoke the remainder of the chain via the given chain input
+ */
+export type ChainedLambdaHandlerFunction<RequestParameters, RequestArrayParameters, RequestBody, Response> = (
+  input: ChainedRequestInput<RequestParameters, RequestArrayParameters, RequestBody, Response>,
+) => Promise<Response>;
+
+// Type for a lambda handler function to be wrapped
+export type LambdaHandlerFunction<RequestParameters, RequestArrayParameters, RequestBody, Response> = (
+  input: RequestInput<RequestParameters, RequestArrayParameters, RequestBody>,
+) => Promise<Response>;
+
+export interface LambdaHandlerChain<RequestParameters, RequestArrayParameters, RequestBody, Response> {
+  next: LambdaHandlerFunction<RequestParameters, RequestArrayParameters, RequestBody, Response>;
+}
+
+// Interceptor is a type alias for ChainedLambdaHandlerFunction
+export type Interceptor<RequestParameters, RequestArrayParameters, RequestBody, Response> = ChainedLambdaHandlerFunction<RequestParameters, RequestArrayParameters, RequestBody, Response>;
+
+/**
+ * Build a chain from the given array of chained lambda handlers
+ */
+const buildHandlerChain = <RequestParameters, RequestArrayParameters, RequestBody, Response>(
+  ...handlers: ChainedLambdaHandlerFunction<RequestParameters, RequestArrayParameters, RequestBody, Response>[]
+): LambdaHandlerChain<RequestParameters, RequestArrayParameters, RequestBody, Response> => {
+  if (handlers.length === 0) {
+    return {
+      next: () => {
+        throw new Error(\\"No more handlers remain in the chain! The last handler should not call next.\\");
+      }
+    };
+  }
+  const [currentHandler, ...remainingHandlers] = handlers;
+  return {
+    next: (input) => {
+      return currentHandler({
+        ...input,
+        chain: buildHandlerChain(...remainingHandlers),
+      });
+    },
+  };
+};
+
+/**
+ * Single-value path/query parameters for Neither
+ */
+export interface NeitherRequestParameters {
+}
+
+/**
+ * Multi-value query parameters for Neither
+ */
+export interface NeitherRequestArrayParameters {
+}
+
+/**
+ * Request body parameter for Neither
+ */
+export type NeitherRequestBody = never;
+
+export type Neither200OperationResponse = OperationResponse<200, undefined>;
+export type NeitherOperationResponses = | Neither200OperationResponse ;
+
+// Type that the handler function provided to the wrapper must conform to
+export type NeitherHandlerFunction = LambdaHandlerFunction<NeitherRequestParameters, NeitherRequestArrayParameters, NeitherRequestBody, NeitherOperationResponses>;
+export type NeitherChainedHandlerFunction = ChainedLambdaHandlerFunction<NeitherRequestParameters, NeitherRequestArrayParameters, NeitherRequestBody, NeitherOperationResponses>;
+
+/**
+ * Lambda handler wrapper to provide typed interface for the implementation of neither
+ */
+export const neitherHandler = (
+    firstHandler: NeitherChainedHandlerFunction,
+    ...remainingHandlers: NeitherChainedHandlerFunction[]
+): OperationApiGatewayLambdaHandler<'neither'> => async (event: any, context: any, _callback?: any, additionalInterceptors: NeitherChainedHandlerFunction[] = []): Promise<any> => {
+    const requestParameters = decodeRequestParameters({
+        ...(event.pathParameters || {}),
+        ...(event.queryStringParameters || {}),
+    }) as unknown as NeitherRequestParameters;
+
+    const requestArrayParameters = decodeRequestParameters({
+        ...(event.multiValueQueryStringParameters || {}),
+    }) as unknown as NeitherRequestArrayParameters;
+
+    const demarshal = (bodyString: string): any => {
+        return {};
+    };
+    const body = parseBody(event.body, demarshal, ['application/json']) as NeitherRequestBody;
+
+    const chain = buildHandlerChain(...additionalInterceptors, firstHandler, ...remainingHandlers);
+    const response = await chain.next({
+        input: {
+            requestParameters,
+            requestArrayParameters,
+            body,
+        },
+        event,
+        context,
+        interceptorContext: {},
+    });
+
+    const marshal = (statusCode: number, responseBody: any): string => {
+        let marshalledBody = responseBody;
+        switch(statusCode) {
+            case 200:
+                break;
+            default:
+                break;
+        }
+
+        return marshalledBody;
+    };
+
+    return {
+        ...response,
+        body: response.body ? marshal(response.statusCode, response.body) : '',
+    };
+};
+/**
+ * Single-value path/query parameters for Both
+ */
+export interface BothRequestParameters {
+}
+
+/**
+ * Multi-value query parameters for Both
+ */
+export interface BothRequestArrayParameters {
+}
+
+/**
+ * Request body parameter for Both
+ */
+export type BothRequestBody = never;
+
+export type Both200OperationResponse = OperationResponse<200, undefined>;
+export type BothOperationResponses = | Both200OperationResponse ;
+
+// Type that the handler function provided to the wrapper must conform to
+export type BothHandlerFunction = LambdaHandlerFunction<BothRequestParameters, BothRequestArrayParameters, BothRequestBody, BothOperationResponses>;
+export type BothChainedHandlerFunction = ChainedLambdaHandlerFunction<BothRequestParameters, BothRequestArrayParameters, BothRequestBody, BothOperationResponses>;
+
+/**
+ * Lambda handler wrapper to provide typed interface for the implementation of both
+ */
+export const bothHandler = (
+    firstHandler: BothChainedHandlerFunction,
+    ...remainingHandlers: BothChainedHandlerFunction[]
+): OperationApiGatewayLambdaHandler<'both'> => async (event: any, context: any, _callback?: any, additionalInterceptors: BothChainedHandlerFunction[] = []): Promise<any> => {
+    const requestParameters = decodeRequestParameters({
+        ...(event.pathParameters || {}),
+        ...(event.queryStringParameters || {}),
+    }) as unknown as BothRequestParameters;
+
+    const requestArrayParameters = decodeRequestParameters({
+        ...(event.multiValueQueryStringParameters || {}),
+    }) as unknown as BothRequestArrayParameters;
+
+    const demarshal = (bodyString: string): any => {
+        return {};
+    };
+    const body = parseBody(event.body, demarshal, ['application/json']) as BothRequestBody;
+
+    const chain = buildHandlerChain(...additionalInterceptors, firstHandler, ...remainingHandlers);
+    const response = await chain.next({
+        input: {
+            requestParameters,
+            requestArrayParameters,
+            body,
+        },
+        event,
+        context,
+        interceptorContext: {},
+    });
+
+    const marshal = (statusCode: number, responseBody: any): string => {
+        let marshalledBody = responseBody;
+        switch(statusCode) {
+            case 200:
+                break;
+            default:
+                break;
+        }
+
+        return marshalledBody;
+    };
+
+    return {
+        ...response,
+        body: response.body ? marshal(response.statusCode, response.body) : '',
+    };
+};
+/**
+ * Single-value path/query parameters for Tag1
+ */
+export interface Tag1RequestParameters {
+}
+
+/**
+ * Multi-value query parameters for Tag1
+ */
+export interface Tag1RequestArrayParameters {
+}
+
+/**
+ * Request body parameter for Tag1
+ */
+export type Tag1RequestBody = never;
+
+export type Tag1200OperationResponse = OperationResponse<200, undefined>;
+export type Tag1OperationResponses = | Tag1200OperationResponse ;
+
+// Type that the handler function provided to the wrapper must conform to
+export type Tag1HandlerFunction = LambdaHandlerFunction<Tag1RequestParameters, Tag1RequestArrayParameters, Tag1RequestBody, Tag1OperationResponses>;
+export type Tag1ChainedHandlerFunction = ChainedLambdaHandlerFunction<Tag1RequestParameters, Tag1RequestArrayParameters, Tag1RequestBody, Tag1OperationResponses>;
+
+/**
+ * Lambda handler wrapper to provide typed interface for the implementation of tag1
+ */
+export const tag1Handler = (
+    firstHandler: Tag1ChainedHandlerFunction,
+    ...remainingHandlers: Tag1ChainedHandlerFunction[]
+): OperationApiGatewayLambdaHandler<'tag1'> => async (event: any, context: any, _callback?: any, additionalInterceptors: Tag1ChainedHandlerFunction[] = []): Promise<any> => {
+    const requestParameters = decodeRequestParameters({
+        ...(event.pathParameters || {}),
+        ...(event.queryStringParameters || {}),
+    }) as unknown as Tag1RequestParameters;
+
+    const requestArrayParameters = decodeRequestParameters({
+        ...(event.multiValueQueryStringParameters || {}),
+    }) as unknown as Tag1RequestArrayParameters;
+
+    const demarshal = (bodyString: string): any => {
+        return {};
+    };
+    const body = parseBody(event.body, demarshal, ['application/json']) as Tag1RequestBody;
+
+    const chain = buildHandlerChain(...additionalInterceptors, firstHandler, ...remainingHandlers);
+    const response = await chain.next({
+        input: {
+            requestParameters,
+            requestArrayParameters,
+            body,
+        },
+        event,
+        context,
+        interceptorContext: {},
+    });
+
+    const marshal = (statusCode: number, responseBody: any): string => {
+        let marshalledBody = responseBody;
+        switch(statusCode) {
+            case 200:
+                break;
+            default:
+                break;
+        }
+
+        return marshalledBody;
+    };
+
+    return {
+        ...response,
+        body: response.body ? marshal(response.statusCode, response.body) : '',
+    };
+};
+/**
+ * Single-value path/query parameters for Tag2
+ */
+export interface Tag2RequestParameters {
+}
+
+/**
+ * Multi-value query parameters for Tag2
+ */
+export interface Tag2RequestArrayParameters {
+}
+
+/**
+ * Request body parameter for Tag2
+ */
+export type Tag2RequestBody = never;
+
+export type Tag2200OperationResponse = OperationResponse<200, undefined>;
+export type Tag2OperationResponses = | Tag2200OperationResponse ;
+
+// Type that the handler function provided to the wrapper must conform to
+export type Tag2HandlerFunction = LambdaHandlerFunction<Tag2RequestParameters, Tag2RequestArrayParameters, Tag2RequestBody, Tag2OperationResponses>;
+export type Tag2ChainedHandlerFunction = ChainedLambdaHandlerFunction<Tag2RequestParameters, Tag2RequestArrayParameters, Tag2RequestBody, Tag2OperationResponses>;
+
+/**
+ * Lambda handler wrapper to provide typed interface for the implementation of tag2
+ */
+export const tag2Handler = (
+    firstHandler: Tag2ChainedHandlerFunction,
+    ...remainingHandlers: Tag2ChainedHandlerFunction[]
+): OperationApiGatewayLambdaHandler<'tag2'> => async (event: any, context: any, _callback?: any, additionalInterceptors: Tag2ChainedHandlerFunction[] = []): Promise<any> => {
+    const requestParameters = decodeRequestParameters({
+        ...(event.pathParameters || {}),
+        ...(event.queryStringParameters || {}),
+    }) as unknown as Tag2RequestParameters;
+
+    const requestArrayParameters = decodeRequestParameters({
+        ...(event.multiValueQueryStringParameters || {}),
+    }) as unknown as Tag2RequestArrayParameters;
+
+    const demarshal = (bodyString: string): any => {
+        return {};
+    };
+    const body = parseBody(event.body, demarshal, ['application/json']) as Tag2RequestBody;
+
+    const chain = buildHandlerChain(...additionalInterceptors, firstHandler, ...remainingHandlers);
+    const response = await chain.next({
+        input: {
+            requestParameters,
+            requestArrayParameters,
+            body,
+        },
+        event,
+        context,
+        interceptorContext: {},
+    });
+
+    const marshal = (statusCode: number, responseBody: any): string => {
+        let marshalledBody = responseBody;
+        switch(statusCode) {
+            case 200:
+                break;
+            default:
+                break;
+        }
+
+        return marshalledBody;
+    };
+
+    return {
+        ...response,
+        body: response.body ? marshal(response.statusCode, response.body) : '',
+    };
+};
+
+export interface HandlerRouterHandlers {
+  readonly neither: OperationApiGatewayLambdaHandler<'neither'>;
+  readonly both: OperationApiGatewayLambdaHandler<'both'>;
+  readonly tag1: OperationApiGatewayLambdaHandler<'tag1'>;
+  readonly tag2: OperationApiGatewayLambdaHandler<'tag2'>;
+}
+
+export type AnyOperationRequestParameters = | NeitherRequestParameters| BothRequestParameters| Tag1RequestParameters| Tag2RequestParameters;
+export type AnyOperationRequestArrayParameters = | NeitherRequestArrayParameters| BothRequestArrayParameters| Tag1RequestArrayParameters| Tag2RequestArrayParameters;
+export type AnyOperationRequestBodies = | NeitherRequestBody| BothRequestBody| Tag1RequestBody| Tag2RequestBody;
+export type AnyOperationResponses = | NeitherOperationResponses| BothOperationResponses| Tag1OperationResponses| Tag2OperationResponses;
+
+export interface HandlerRouterProps<
+  RequestParameters,
+  RequestArrayParameters,
+  RequestBody,
+  Response extends AnyOperationResponses
+> {
+  /**
+   * Interceptors to apply to all handlers
+   */
+  readonly interceptors?: ChainedLambdaHandlerFunction<
+    RequestParameters,
+    RequestArrayParameters,
+    RequestBody,
+    Response
+  >[];
+
+  /**
+   * Handlers to register for each operation
+   */
+  readonly handlers: HandlerRouterHandlers;
+}
+
+const concatMethodAndPath = (method: string, path: string) => \`\${method.toLowerCase()}||\${path}\`;
 
-export function TestRequestToJSON(value?: TestRequest | null): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    if (value === null) {
-        return null;
-    }
-    return {
-        
-        'myInput': value.myInput,
-    };
-}
+const OperationIdByMethodAndPath = Object.fromEntries(Object.entries(OperationLookup).map(
+  ([operationId, methodAndPath]) => [concatMethodAndPath(methodAndPath.method, methodAndPath.path), operationId]
+));
 
+/**
+ * Returns a lambda handler which can be used to route requests to the appropriate typed lambda handler function.
+ */
+export const handlerRouter = (props: HandlerRouterProps<
+  AnyOperationRequestParameters,
+  AnyOperationRequestArrayParameters,
+  AnyOperationRequestBodies,
+  AnyOperationResponses
+>): OperationApiGatewayLambdaHandler<OperationIds> => async (event, context) => {
+  const operationId = OperationIdByMethodAndPath[concatMethodAndPath(event.requestContext.httpMethod, event.requestContext.resourcePath)];
+  const handler = props.handlers[operationId];
+  return handler(event, context, undefined, props.interceptors);
+};
 ",
-  "src/models/TestResponse.ts": "/* tslint:disable */
+  "src/apis/Tag1Api.ts": "/* tslint:disable */
 /* eslint-disable */
 /**
- * Example API
+ * Multiple Tags Test
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: 1.0.0
@@ -1704,61 +4107,66 @@ export function TestRequestToJSON(value?: TestRequest | null): any {
  * Do not edit the class manually.
  */
 
-import { exists, mapValues } from '../runtime';
-import {
-    TestResponseMessagesInner,
-    TestResponseMessagesInnerFromJSON,
-    TestResponseMessagesInnerFromJSONTyped,
-    TestResponseMessagesInnerToJSON,
-} from './TestResponseMessagesInner';
+
+import * as runtime from '../runtime';
 
 /**
  * 
- * @export
- * @interface TestResponse
  */
-export interface TestResponse {
+export class Tag1Api extends runtime.BaseAPI {
+
     /**
-     * 
-     * @type {Array<TestResponseMessagesInner>}
-     * @memberof TestResponse
      */
-    messages: Array<TestResponseMessagesInner>;
-}
+    async bothRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        const queryParameters: any = {};
 
+        const headerParameters: runtime.HTTPHeaders = {};
 
-export function TestResponseFromJSON(json: any): TestResponse {
-    return TestResponseFromJSONTyped(json, false);
-}
+        const response = await this.request({
+            path: \`/both\`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
 
-export function TestResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): TestResponse {
-    if ((json === undefined) || (json === null)) {
-        return json;
+        return new runtime.VoidApiResponse(response);
     }
-    return {
-        
-        'messages': ((json['messages'] as Array<any>).map(TestResponseMessagesInnerFromJSON)),
-    };
-}
 
-export function TestResponseToJSON(value?: TestResponse | null): any {
-    if (value === undefined) {
-        return undefined;
+    /**
+     */
+    async both(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.bothRaw(initOverrides);
     }
-    if (value === null) {
-        return null;
+
+    /**
+     */
+    async tag1Raw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: \`/tag1\`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     */
+    async tag1(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.tag1Raw(initOverrides);
     }
-    return {
-        
-        'messages': ((value.messages as Array<any>).map(TestResponseMessagesInnerToJSON)),
-    };
-}
 
+}
 ",
-  "src/models/TestResponseMessagesInner.ts": "/* tslint:disable */
+  "src/apis/Tag2Api.ts": "/* tslint:disable */
 /* eslint-disable */
 /**
- * Example API
+ * Multiple Tags Test
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: 1.0.0
@@ -1769,69 +4177,55 @@ export function TestResponseToJSON(value?: TestResponse | null): any {
  * Do not edit the class manually.
  */
 
-import { exists, mapValues } from '../runtime';
+
+import * as runtime from '../runtime';
+
 /**
  * 
- * @export
- * @interface TestResponseMessagesInner
  */
-export interface TestResponseMessagesInner {
-    /**
-     * 
-     * @type {string}
-     * @memberof TestResponseMessagesInner
-     */
-    message?: string;
+export class Tag2Api extends runtime.BaseAPI {
+
     /**
-     * 
-     * @type {number}
-     * @memberof TestResponseMessagesInner
      */
-    id: number;
-}
+    async tag2Raw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        const queryParameters: any = {};
 
+        const headerParameters: runtime.HTTPHeaders = {};
 
-export function TestResponseMessagesInnerFromJSON(json: any): TestResponseMessagesInner {
-    return TestResponseMessagesInnerFromJSONTyped(json, false);
-}
+        const response = await this.request({
+            path: \`/tag2\`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
 
-export function TestResponseMessagesInnerFromJSONTyped(json: any, ignoreDiscriminator: boolean): TestResponseMessagesInner {
-    if ((json === undefined) || (json === null)) {
-        return json;
+        return new runtime.VoidApiResponse(response);
     }
-    return {
-        
-        'message': !exists(json, 'message') ? undefined : json['message'],
-        'id': json['id'],
-    };
-}
 
-export function TestResponseMessagesInnerToJSON(value?: TestResponseMessagesInner | null): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    if (value === null) {
-        return null;
+    /**
+     */
+    async tag2(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.tag2Raw(initOverrides);
     }
-    return {
-        
-        'message': value.message,
-        'id': value.id,
-    };
-}
 
+}
 ",
-  "src/models/index.ts": "/* tslint:disable */
+  "src/apis/index.ts": "/* tslint:disable */
 /* eslint-disable */
-export * from './ApiError';
-export * from './TestRequest';
-export * from './TestResponse';
-export * from './TestResponseMessagesInner';
+export * from './DefaultApi';
+export * from './Tag1Api';
+export * from './Tag2Api';
 ",
+  "src/index.ts": "/* tslint:disable */
+/* eslint-disable */
+export * from './runtime';
+export * from './apis';
+export * from './models';
+export * from './apis/DefaultApi/OperationConfig';",
   "src/runtime.ts": "/* tslint:disable */
 /* eslint-disable */
 /**
- * Example API
+ * Multiple Tags Test
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: 1.0.0
@@ -1943,16 +4337,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -1976,22 +4370,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -2007,7 +4401,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -2034,22 +4450,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -2069,10 +4492,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -2099,7 +4522,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -2136,7 +4559,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -2152,9 +4575,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -2264,8 +4696,6 @@ test('hello', () => {
 }
 `;
 
-exports[`Generated Typescript Client Code Unit Tests Multiple Tags 1`] = `"Operations with multiple tags are not yet supported, please tag operations with at most one tag. The following operations have multiple tags: get /both"`;
-
 exports[`Generated Typescript Client Code Unit Tests Single 1`] = `
 Object {
   ".eslintrc.json": Object {
@@ -2859,7 +5289,7 @@ src/runtime.ts
 tsconfig.esm.json
 tsconfig.json
 ",
-  ".openapi-generator/VERSION": "6.0.0",
+  ".openapi-generator/VERSION": "6.3.0",
   ".projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -3493,14 +5923,16 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiError,
+  TestRequest,
+  TestResponse,
+} from '../models';
 import {
-    ApiError,
     ApiErrorFromJSON,
     ApiErrorToJSON,
-    TestRequest,
     TestRequestFromJSON,
     TestRequestToJSON,
-    TestResponse,
     TestResponseFromJSON,
     TestResponseToJSON,
 } from '../models';
@@ -3529,7 +5961,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async anyRequestResponseRaw(requestParameters: AnyRequestResponseRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<any>> {
+    async anyRequestResponseRaw(requestParameters: AnyRequestResponseRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<any>> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -3549,14 +5981,14 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async anyRequestResponse(requestParameters: AnyRequestResponseRequest = {}, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<any> {
+    async anyRequestResponse(requestParameters: AnyRequestResponseRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<any> {
         const response = await this.anyRequestResponseRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
      */
-    async emptyRaw(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<void>> {
+    async emptyRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -3573,13 +6005,13 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async empty(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<void> {
+    async empty(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
         await this.emptyRaw(initOverrides);
     }
 
     /**
      */
-    async mediaTypesRaw(requestParameters: MediaTypesRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<string>> {
+    async mediaTypesRaw(requestParameters: MediaTypesRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<string>> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling mediaTypes.');
         }
@@ -3603,14 +6035,14 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async mediaTypes(requestParameters: MediaTypesRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<string> {
+    async mediaTypes(requestParameters: MediaTypesRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<string> {
         const response = await this.mediaTypesRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
      */
-    async operationOneRaw(requestParameters: OperationOneRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<TestResponse>> {
+    async operationOneRaw(requestParameters: OperationOneRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<TestResponse>> {
         if (requestParameters.param1 === null || requestParameters.param1 === undefined) {
             throw new runtime.RequiredError('param1','Required parameter requestParameters.param1 was null or undefined when calling operationOne.');
         }
@@ -3666,14 +6098,14 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async operationOne(requestParameters: OperationOneRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<TestResponse> {
+    async operationOne(requestParameters: OperationOneRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<TestResponse> {
         const response = await this.operationOneRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
      */
-    async withoutOperationIdDeleteRaw(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<TestResponse>> {
+    async withoutOperationIdDeleteRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<TestResponse>> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -3690,7 +6122,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async withoutOperationIdDelete(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<TestResponse> {
+    async withoutOperationIdDelete(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<TestResponse> {
         const response = await this.withoutOperationIdDeleteRaw(initOverrides);
         return await response.value();
     }
@@ -4344,6 +6776,16 @@ export interface ApiError {
 }
 
 
+/**
+ * Check if a given object implements the ApiError interface.
+ */
+export function instanceOfApiError(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorFromJSON(json: any): ApiError {
     return ApiErrorFromJSONTyped(json, false);
 }
@@ -4402,6 +6844,15 @@ export interface TestRequest {
 }
 
 
+/**
+ * Check if a given object implements the TestRequest interface.
+ */
+export function instanceOfTestRequest(value: object): boolean {
+    let isInstance = true;
+
+    return isInstance;
+}
+
 export function TestRequestFromJSON(json: any): TestRequest {
     return TestRequestFromJSONTyped(json, false);
 }
@@ -4445,8 +6896,8 @@ export function TestRequestToJSON(value?: TestRequest | null): any {
  */
 
 import { exists, mapValues } from '../runtime';
+import type { TestResponseMessagesInner } from './TestResponseMessagesInner';
 import {
-    TestResponseMessagesInner,
     TestResponseMessagesInnerFromJSON,
     TestResponseMessagesInnerFromJSONTyped,
     TestResponseMessagesInnerToJSON,
@@ -4467,6 +6918,16 @@ export interface TestResponse {
 }
 
 
+/**
+ * Check if a given object implements the TestResponse interface.
+ */
+export function instanceOfTestResponse(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"messages\\" in value;
+
+    return isInstance;
+}
+
 export function TestResponseFromJSON(json: any): TestResponse {
     return TestResponseFromJSONTyped(json, false);
 }
@@ -4531,6 +6992,16 @@ export interface TestResponseMessagesInner {
 }
 
 
+/**
+ * Check if a given object implements the TestResponseMessagesInner interface.
+ */
+export function instanceOfTestResponseMessagesInner(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"id\\" in value;
+
+    return isInstance;
+}
+
 export function TestResponseMessagesInnerFromJSON(json: any): TestResponseMessagesInner {
     return TestResponseMessagesInnerFromJSONTyped(json, false);
 }
@@ -4683,16 +7154,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -4716,22 +7187,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -4747,7 +7218,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -4774,22 +7267,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -4809,10 +7309,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -4839,7 +7339,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -4876,7 +7376,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -4892,9 +7392,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -5586,7 +8095,7 @@ src/runtime.ts
 tsconfig.esm.json
 tsconfig.json
 ",
-  ".openapi-generator/VERSION": "6.0.0",
+  ".openapi-generator/VERSION": "6.3.0",
   ".projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -6228,7 +8737,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async neitherRaw(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<void>> {
+    async neitherRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -6245,7 +8754,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async neither(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<void> {
+    async neither(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
         await this.neitherRaw(initOverrides);
     }
 
@@ -6778,7 +9287,7 @@ export class Tag1Api extends runtime.BaseAPI {
 
     /**
      */
-    async tag1Raw(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<void>> {
+    async tag1Raw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -6795,13 +9304,13 @@ export class Tag1Api extends runtime.BaseAPI {
 
     /**
      */
-    async tag1(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<void> {
+    async tag1(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
         await this.tag1Raw(initOverrides);
     }
 
     /**
      */
-    async tag1AgainRaw(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<void>> {
+    async tag1AgainRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -6818,7 +9327,7 @@ export class Tag1Api extends runtime.BaseAPI {
 
     /**
      */
-    async tag1Again(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<void> {
+    async tag1Again(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
         await this.tag1AgainRaw(initOverrides);
     }
 
@@ -6848,7 +9357,7 @@ export class Tag2Api extends runtime.BaseAPI {
 
     /**
      */
-    async tag2Raw(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<void>> {
+    async tag2Raw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -6865,7 +9374,7 @@ export class Tag2Api extends runtime.BaseAPI {
 
     /**
      */
-    async tag2(initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<void> {
+    async tag2(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
         await this.tag2Raw(initOverrides);
     }
 
@@ -6998,16 +9507,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -7031,22 +9540,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -7062,7 +9571,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -7089,22 +9620,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -7124,10 +9662,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -7154,7 +9692,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -7191,7 +9729,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -7207,9 +9745,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-html2-docs.test.ts.snap b/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-html2-docs.test.ts.snap
index 2492b5b34..c47d31836 100644
--- a/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-html2-docs.test.ts.snap
+++ b/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-html2-docs.test.ts.snap
@@ -111,7 +111,7 @@ node_modules/
   "html2/.openapi-generator/FILES": ".openapi-generator-ignore
 index.html
 ",
-  "html2/.openapi-generator/VERSION": "6.0.0",
+  "html2/.openapi-generator/VERSION": "6.3.0",
   "html2/index.html": "<!DOCTYPE html>
 <html>
 <head>
@@ -1082,10 +1082,7 @@ ul.nav-tabs {
                             <pre class=\\"prettyprint\\"><code class=\\"language-bsh\\">curl -X POST \\\\
  -H \\"Accept: application/json\\" \\\\
  -H \\"Content-Type: application/json\\" \\\\
- \\"http://localhost/operation/{pathParam}\\" \\\\
- -d '{
-  &quot;myInput&quot; : 0.8008281904610115
-}'
+ \\"http://localhost/operation/{pathParam}\\"
 </code></pre>
                           </div>
                           <div class=\\"tab-pane\\" id=\\"examples-Default-someTestOperation-0-java\\">
@@ -1402,22 +1399,18 @@ $(document).ready(function() {
                                   <div id=\\"responses-Default-someTestOperation-schema-200\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Successful response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/TestResponse\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -1468,22 +1461,18 @@ $(document).ready(function() {
                                   <div id=\\"responses-Default-someTestOperation-schema-400\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Error response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/ApiError\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -3377,7 +3366,7 @@ node_modules/
   "html2/.openapi-generator/FILES": ".openapi-generator-ignore
 index.html
 ",
-  "html2/.openapi-generator/VERSION": "6.0.0",
+  "html2/.openapi-generator/VERSION": "6.3.0",
   "html2/index.html": "<!DOCTYPE html>
 <html>
 <head>
@@ -4360,8 +4349,7 @@ ul.nav-tabs {
                             <pre class=\\"prettyprint\\"><code class=\\"language-bsh\\">curl -X PUT \\\\
  -H \\"Accept: application/json\\" \\\\
  -H \\"Content-Type: application/json\\" \\\\
- \\"http://localhost/any-request-response\\" \\\\
- -d ''
+ \\"http://localhost/any-request-response\\"
 </code></pre>
                           </div>
                           <div class=\\"tab-pane\\" id=\\"examples-Default-anyRequestResponse-0-java\\">
@@ -4640,20 +4628,18 @@ $(document).ready(function() {
                                   <div id=\\"responses-Default-anyRequestResponse-schema-200\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Any response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : { }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -4957,8 +4943,7 @@ pub fn main() {
                             <pre class=\\"prettyprint\\"><code class=\\"language-bsh\\">curl -X POST \\\\
  -H \\"Accept: application/x-mpegurl\\" \\\\
  -H \\"Content-Type: application/pdf\\" \\\\
- \\"http://localhost/different-media-type\\" \\\\
- -d ''
+ \\"http://localhost/different-media-type\\"
 </code></pre>
                           </div>
                           <div class=\\"tab-pane\\" id=\\"examples-Default-mediaTypes-0-java\\">
@@ -5239,22 +5224,18 @@ $(document).ready(function() {
                                   <div id=\\"responses-Default-mediaTypes-schema-200\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Success\\",
-  \\"content\\" : {
-    \\"application/x-mpegurl\\" : {
-      \\"schema\\" : {
-        \\"type\\" : \\"string\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -5314,10 +5295,7 @@ $(document).ready(function() {
                             <pre class=\\"prettyprint\\"><code class=\\"language-bsh\\">curl -X POST \\\\
  -H \\"Accept: application/json\\" \\\\
  -H \\"Content-Type: application/json\\" \\\\
- \\"http://localhost/path/{pathParam}?param1=param1_example&param2=&param3=8.14&param4=param4_example\\" \\\\
- -d '{
-  &quot;myInput&quot; : 0.8008281904610115
-}'
+ \\"http://localhost/path/{pathParam}?param1=param1_example&param2=&param3=8.14&param4=param4_example\\"
 </code></pre>
                           </div>
                           <div class=\\"tab-pane\\" id=\\"examples-Default-operationOne-0-java\\">
@@ -5760,22 +5738,18 @@ $(document).ready(function() {
                                   <div id=\\"responses-Default-operationOne-schema-200\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Successful response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/TestResponse\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -5826,22 +5800,18 @@ $(document).ready(function() {
                                   <div id=\\"responses-Default-operationOne-schema-400\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Error response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/ApiError\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -6124,22 +6094,18 @@ pub fn main() {
                                   <div id=\\"responses-Default-withoutOperationIdDelete-schema-200\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Successful response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/TestResponse\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
diff --git a/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-markdown-docs.test.ts.snap b/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-markdown-docs.test.ts.snap
index bc55dffdd..7543d33ce 100644
--- a/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-markdown-docs.test.ts.snap
+++ b/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-markdown-docs.test.ts.snap
@@ -116,7 +116,7 @@ Models/TestResponse.md
 Models/TestResponse_messages_inner.md
 README.md
 ",
-  "markdown/.openapi-generator/VERSION": "6.0.0",
+  "markdown/.openapi-generator/VERSION": "6.3.0",
   "markdown/Apis/DefaultApi.md": "# DefaultApi
 
 All URIs are relative to *http://localhost*
@@ -339,7 +339,7 @@ Models/TestResponse.md
 Models/TestResponse_messages_inner.md
 README.md
 ",
-  "markdown/.openapi-generator/VERSION": "6.0.0",
+  "markdown/.openapi-generator/VERSION": "6.3.0",
   "markdown/Apis/DefaultApi.md": "# DefaultApi
 
 All URIs are relative to *http://localhost*
diff --git a/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-plantuml-docs.test.ts.snap b/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-plantuml-docs.test.ts.snap
index 6f09640ed..8fcd78e6d 100644
--- a/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-plantuml-docs.test.ts.snap
+++ b/packages/open-api-gateway/test/project/codegen/components/docs/__snapshots__/generated-plantuml-docs.test.ts.snap
@@ -111,7 +111,7 @@ node_modules/
   "plantuml/.openapi-generator/FILES": ".openapi-generator-ignore
 schemas.plantuml
 ",
-  "plantuml/.openapi-generator/VERSION": "6.0.0",
+  "plantuml/.openapi-generator/VERSION": "6.3.0",
   "plantuml/schemas.plantuml": "@startuml
 
 title Example API Schemas Diagram
@@ -251,7 +251,7 @@ node_modules/
   "plantuml/.openapi-generator/FILES": ".openapi-generator-ignore
 schemas.plantuml
 ",
-  "plantuml/.openapi-generator/VERSION": "6.0.0",
+  "plantuml/.openapi-generator/VERSION": "6.3.0",
   "plantuml/schemas.plantuml": "@startuml
 
 title Example API Schemas Diagram
diff --git a/packages/open-api-gateway/test/project/codegen/components/generated-java-client-source-code.test.ts b/packages/open-api-gateway/test/project/codegen/components/generated-java-client-source-code.test.ts
index 3f9564336..c06232194 100644
--- a/packages/open-api-gateway/test/project/codegen/components/generated-java-client-source-code.test.ts
+++ b/packages/open-api-gateway/test/project/codegen/components/generated-java-client-source-code.test.ts
@@ -34,10 +34,6 @@ describe("Generated Java Client Code Unit Tests", () => {
   });
 
   it("Multiple Tags", () => {
-    // TODO: Remove this validation and update mustache templates as appropriate when the following has been addressed:
-    // https://github.com/OpenAPITools/openapi-generator/pull/14568
-    expect(() =>
-      synthGeneratedCode("multiple-tags.yaml")
-    ).toThrowErrorMatchingSnapshot();
+    expect(synthGeneratedCode("multiple-tags.yaml")).toMatchSnapshot();
   });
 });
diff --git a/packages/open-api-gateway/test/project/codegen/components/generated-python-client-source-code.test.ts b/packages/open-api-gateway/test/project/codegen/components/generated-python-client-source-code.test.ts
index 28a579cfa..92fc7066f 100644
--- a/packages/open-api-gateway/test/project/codegen/components/generated-python-client-source-code.test.ts
+++ b/packages/open-api-gateway/test/project/codegen/components/generated-python-client-source-code.test.ts
@@ -35,10 +35,6 @@ describe("Generated Python Client Code Unit Tests", () => {
   });
 
   it("Multiple Tags", () => {
-    // TODO: Remove this validation and update mustache templates as appropriate when the following has been addressed:
-    // https://github.com/OpenAPITools/openapi-generator/pull/14568
-    expect(() =>
-      synthGeneratedCode("multiple-tags.yaml")
-    ).toThrowErrorMatchingSnapshot();
+    expect(synthGeneratedCode("multiple-tags.yaml")).toMatchSnapshot();
   });
 });
diff --git a/packages/open-api-gateway/test/project/codegen/components/generated-typescript-client-source-code.test.ts b/packages/open-api-gateway/test/project/codegen/components/generated-typescript-client-source-code.test.ts
index babcdab5c..d7e825587 100644
--- a/packages/open-api-gateway/test/project/codegen/components/generated-typescript-client-source-code.test.ts
+++ b/packages/open-api-gateway/test/project/codegen/components/generated-typescript-client-source-code.test.ts
@@ -32,10 +32,6 @@ describe("Generated Typescript Client Code Unit Tests", () => {
   });
 
   it("Multiple Tags", () => {
-    // TODO: Remove this validation and update mustache templates as appropriate when the following has been addressed:
-    // https://github.com/OpenAPITools/openapi-generator/pull/14568
-    expect(() =>
-      synthGeneratedCode("multiple-tags.yaml")
-    ).toThrowErrorMatchingSnapshot();
+    expect(synthGeneratedCode("multiple-tags.yaml")).toMatchSnapshot();
   });
 });
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/monorepo.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/monorepo.test.ts.snap
index c6755f255..dce97dd06 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/monorepo.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/monorepo.test.ts.snap
@@ -1364,7 +1364,7 @@ src/test/java/com/generated/api/myapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/myapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "packages/my-api/generated/java/.openapi-generator/VERSION": "6.0.1",
+  "packages/my-api/generated/java/.openapi-generator/VERSION": "6.3.0",
   "packages/my-api/generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -1485,17 +1485,17 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -1505,7 +1505,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -1530,7 +1530,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -1545,7 +1545,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -1889,8 +1889,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -1914,7 +1912,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -1966,7 +1964,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -2007,20 +2005,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -2080,19 +2078,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -3270,17 +3269,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -3290,7 +3289,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -3315,7 +3314,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -3331,7 +3330,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -3474,6 +3473,15 @@ import com.generated.api.myapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -3567,6 +3575,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -3691,7 +3726,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -3702,7 +3737,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -3713,7 +3748,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -3724,7 +3759,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -3735,7 +3770,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -3828,6 +3863,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -3996,7 +4043,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -4004,7 +4051,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -4255,7 +4302,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -4289,11 +4336,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -4584,7 +4633,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -4713,11 +4773,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -4751,6 +4812,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -4818,7 +4904,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -4851,7 +4937,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.myapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -4972,7 +5058,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -5891,7 +5977,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -6128,7 +6214,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -6141,15 +6226,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -7278,8 +7360,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7296,6 +7376,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7312,7 +7393,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -7326,7 +7407,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -7398,9 +7478,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -7419,7 +7497,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -7497,8 +7575,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7515,6 +7591,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7531,7 +7608,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -7545,7 +7622,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -7617,9 +7693,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -7638,7 +7712,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -7761,8 +7835,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7812,8 +7884,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7995,7 +8065,7 @@ test/test_models/test_api_error_response_content.py
 test/test_models/test_say_hello_response_content.py
 tox.ini
 ",
-  "packages/my-api/generated/python/.openapi-generator/VERSION": "6.1.0",
+  "packages/my-api/generated/python/.openapi-generator/VERSION": "6.3.0",
   "packages/my-api/generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -8160,13 +8230,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -8207,6 +8275,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -8287,7 +8365,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import myapi_python
 from pprint import pprint
-from myapi_python.apis import default_api
+from myapi_python.apis.tags import default_api
 from myapi_python.model.api_error_response_content import ApiErrorResponseContent
 from myapi_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -8414,49 +8492,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -8466,22 +8542,32 @@ No authorization required
 ",
   "packages/my-api/generated/python/docs/models/ApiErrorResponseContent.md": "# myapi_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "packages/my-api/generated/python/docs/models/SayHelloResponseContent.md": "# myapi_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -8489,7 +8575,7 @@ Name | Type | Description | Notes
   "packages/my-api/generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -8596,9 +8682,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -8628,6 +8715,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -8870,7 +8959,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -8899,8 +8988,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -8927,7 +9033,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -8974,8 +9079,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -9070,7 +9178,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9088,7 +9196,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -9151,8 +9259,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -9191,12 +9297,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -9255,7 +9366,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9284,7 +9395,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -9296,7 +9407,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -9312,7 +9423,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9351,14 +9462,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -9375,23 +9486,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -9412,6 +9506,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -9431,13 +9538,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -9479,8 +9589,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -9550,7 +9660,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -9607,15 +9717,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -9627,7 +9740,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -9820,7 +9933,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -9892,9 +10005,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -9938,24 +10051,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -10011,7 +10124,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -10045,17 +10158,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "packages/my-api/generated/python/myapi_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "packages/my-api/generated/python/myapi_python/apis/path_to_api.py": "import typing
+  "packages/my-api/generated/python/myapi_python/apis/path_to_api.py": "import typing_extensions
 
 from myapi_python.paths import PathValues
 from myapi_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -10080,12 +10192,12 @@ class Hello(
 ):
     pass
 ",
-  "packages/my-api/generated/python/myapi_python/apis/tag_to_api.py": "import typing
+  "packages/my-api/generated/python/myapi_python/apis/tag_to_api.py": "import typing_extensions
 
 from myapi_python.apis.tags import TagValues
 from myapi_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -10433,14 +10545,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -10458,26 +10572,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -10802,6 +10896,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -10891,19 +10989,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'myapi_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -10952,6 +11057,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10973,6 +11079,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -10982,36 +11089,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11034,6 +11141,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11055,6 +11163,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11064,36 +11173,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11116,6 +11225,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11137,6 +11247,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11146,36 +11257,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11198,6 +11309,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11219,6 +11331,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11228,36 +11341,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11271,7 +11384,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from myapi_python.model.pet import Pet
+# from myapi_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -11305,6 +11418,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -11315,6 +11429,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11326,15 +11441,15 @@ from myapi_python.model.say_hello_response_content import SayHelloResponseConten
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -11401,18 +11516,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -11458,7 +11604,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -11466,17 +11616,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -11489,17 +11671,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -11519,6 +11733,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -11529,6 +11744,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11538,34 +11754,126 @@ from myapi_python import schemas  # noqa: F401
 from myapi_python.model.api_error_response_content import ApiErrorResponseContent
 from myapi_python.model.say_hello_response_content import SayHelloResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
 )
 
 
-class BaseApi(api_client.Api):
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
 
-    def _say_hello_oapg(
-        self: api_client.Api,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
         used_path = path.value
 
         prefix_separator_iterator = None
@@ -11605,7 +11913,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -11613,17 +11925,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -11636,17 +11980,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -11805,6 +12181,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -11928,6 +12305,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -11962,17 +12340,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -12060,14 +12438,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -12075,15 +12466,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -12096,9 +12487,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -12107,17 +12506,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -12156,8 +12553,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -12166,21 +12625,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -12190,6 +12636,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -12234,16 +12688,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -12260,7 +12714,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -12348,12 +12802,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -12362,14 +12816,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -12386,7 +12840,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -12404,17 +12858,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -12447,35 +12917,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -12497,7 +13171,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -12509,147 +13183,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -12717,7 +13266,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -12727,7 +13276,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -12742,14 +13291,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -12771,9 +13320,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -12837,9 +13386,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -12870,7 +13419,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -12899,7 +13448,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -12907,7 +13456,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -12965,7 +13514,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -12982,7 +13531,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -13003,7 +13552,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13013,7 +13562,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -13023,7 +13572,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13033,7 +13582,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -13076,6 +13625,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -13085,6 +13635,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -13100,7 +13651,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -13110,7 +13661,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -13121,7 +13672,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -13209,7 +13760,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -13224,21 +13775,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -13337,9 +13891,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -13347,6 +13899,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -13363,7 +13916,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -13373,7 +13926,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -13410,7 +13963,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -13435,6 +13988,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -13533,18 +14087,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -13595,8 +14142,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -13611,12 +14159,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -13635,6 +14184,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -13646,9 +14196,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -13699,7 +14250,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -13736,8 +14289,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -13759,13 +14313,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -13786,7 +14340,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -13796,12 +14349,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -13811,12 +14363,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -13827,14 +14378,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -13873,15 +14424,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -13892,10 +14461,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -13906,10 +14493,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -13918,17 +14523,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -13936,13 +14557,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -13955,34 +14575,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -13991,23 +14611,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -14026,8 +14646,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -14035,24 +14655,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -14062,14 +14682,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -14077,7 +14694,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -14102,18 +14719,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -14122,14 +14738,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -14146,8 +14762,7 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "packages/my-api/generated/python/package.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "__pdk__": true,
@@ -14170,11 +14785,12 @@ def log_cache_usage(cache_fn):
   "packages/my-api/generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "packages/my-api/generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "packages/my-api/generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "packages/my-api/generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -14202,10 +14818,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -14216,7 +14834,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -14326,7 +14944,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -14335,7 +14953,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -14395,9 +15013,10 @@ if __name__ == '__main__':
     unittest.main()
 ",
   "packages/my-api/generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -14474,7 +15093,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/my-api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/my-api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/my-api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -15053,11 +15672,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -15073,7 +15694,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -15098,7 +15719,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -15417,6 +16038,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -15475,6 +16106,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -15623,16 +16264,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -15656,22 +16297,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -15687,7 +16328,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -15714,22 +16377,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -15749,10 +16419,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -15779,7 +16449,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -15816,7 +16486,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -15832,9 +16502,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/standalone.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/standalone.test.ts.snap
index ffb6e4ef9..2b88ef67c 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/standalone.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/standalone.test.ts.snap
@@ -494,7 +494,7 @@ src/test/java/com/generated/api/myapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/myapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -615,17 +615,17 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -635,7 +635,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -660,7 +660,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -675,7 +675,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -1019,8 +1019,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -1044,7 +1042,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -1096,7 +1094,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -1137,20 +1135,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -1210,19 +1208,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -2400,17 +2399,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -2420,7 +2419,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -2445,7 +2444,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -2461,7 +2460,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -2604,6 +2603,15 @@ import com.generated.api.myapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -2697,6 +2705,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -2821,7 +2856,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -2832,7 +2867,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -2843,7 +2878,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -2854,7 +2889,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -2865,7 +2900,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -2958,6 +2993,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -3126,7 +3173,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -3134,7 +3181,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -3385,7 +3432,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -3419,11 +3466,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -3714,7 +3763,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -3843,11 +3903,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -3881,6 +3942,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -3948,7 +4034,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -3981,7 +4067,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.myapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -4102,7 +4188,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -5021,7 +5107,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -5258,7 +5344,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -5271,15 +5356,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -6408,8 +6490,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -6426,6 +6506,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -6442,7 +6523,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -6456,7 +6537,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -6528,9 +6608,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -6549,7 +6627,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -6627,8 +6705,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -6645,6 +6721,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -6661,7 +6738,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -6675,7 +6752,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -6747,9 +6823,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -6768,7 +6842,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -6891,8 +6965,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -6942,8 +7014,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7125,7 +7195,7 @@ test/test_models/test_api_error_response_content.py
 test/test_models/test_say_hello_response_content.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -7292,13 +7362,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -7339,6 +7407,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -7419,7 +7497,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import myapi_python
 from pprint import pprint
-from myapi_python.apis import default_api
+from myapi_python.apis.tags import default_api
 from myapi_python.model.api_error_response_content import ApiErrorResponseContent
 from myapi_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -7546,49 +7624,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -7598,22 +7674,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# myapi_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# myapi_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -7621,7 +7707,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -7728,9 +7814,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -7760,6 +7847,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -8002,7 +8091,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -8031,8 +8120,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -8059,7 +8165,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -8106,8 +8211,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -8202,7 +8310,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -8220,7 +8328,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -8283,8 +8391,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -8323,12 +8429,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -8387,7 +8498,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -8416,7 +8527,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -8428,7 +8539,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -8444,7 +8555,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -8483,14 +8594,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -8507,23 +8618,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -8544,6 +8638,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -8563,13 +8670,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -8611,8 +8721,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -8682,7 +8792,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -8739,15 +8849,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -8759,7 +8872,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -8952,7 +9065,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -9024,9 +9137,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -9070,24 +9183,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -9143,7 +9256,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -9177,17 +9290,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/myapi_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/myapi_python/apis/path_to_api.py": "import typing
+  "generated/python/myapi_python/apis/path_to_api.py": "import typing_extensions
 
 from myapi_python.paths import PathValues
 from myapi_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -9212,12 +9324,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/myapi_python/apis/tag_to_api.py": "import typing
+  "generated/python/myapi_python/apis/tag_to_api.py": "import typing_extensions
 
 from myapi_python.apis.tags import TagValues
 from myapi_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -9565,14 +9677,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -9590,26 +9704,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -9934,6 +10028,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -10023,19 +10121,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'myapi_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -10084,6 +10189,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10105,6 +10211,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -10114,36 +10221,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -10166,6 +10273,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10187,6 +10295,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -10196,36 +10305,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -10248,6 +10357,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10269,6 +10379,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -10278,36 +10389,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -10330,6 +10441,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10351,6 +10463,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -10360,36 +10473,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -10403,7 +10516,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from myapi_python.model.pet import Pet
+# from myapi_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -10437,6 +10550,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -10447,6 +10561,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10458,15 +10573,15 @@ from myapi_python.model.say_hello_response_content import SayHelloResponseConten
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -10533,18 +10648,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -10590,7 +10736,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -10598,17 +10748,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -10621,17 +10803,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -10651,6 +10865,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -10661,6 +10876,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10670,34 +10886,126 @@ from myapi_python import schemas  # noqa: F401
 from myapi_python.model.api_error_response_content import ApiErrorResponseContent
 from myapi_python.model.say_hello_response_content import SayHelloResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
 )
 
 
-class BaseApi(api_client.Api):
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
 
-    def _say_hello_oapg(
-        self: api_client.Api,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
         used_path = path.value
 
         prefix_separator_iterator = None
@@ -10737,7 +11045,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -10745,17 +11057,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -10768,17 +11112,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -10937,6 +11313,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -11060,6 +11437,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -11094,17 +11472,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -11192,14 +11570,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -11207,15 +11598,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -11228,9 +11619,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -11239,17 +11638,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -11288,8 +11685,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -11298,21 +11757,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -11322,6 +11768,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -11366,16 +11820,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -11392,7 +11846,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -11480,12 +11934,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -11494,14 +11948,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -11518,7 +11972,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -11536,17 +11990,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -11579,35 +12049,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -11629,7 +12303,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -11641,147 +12315,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -11849,7 +12398,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -11859,7 +12408,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -11874,14 +12423,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -11903,9 +12452,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -11969,9 +12518,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -12002,7 +12551,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -12031,7 +12580,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -12039,7 +12588,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -12097,7 +12646,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -12114,7 +12663,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -12135,7 +12684,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -12145,7 +12694,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -12155,7 +12704,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -12165,7 +12714,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -12208,6 +12757,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -12217,6 +12767,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -12232,7 +12783,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -12242,7 +12793,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -12253,7 +12804,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -12341,7 +12892,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -12356,21 +12907,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -12469,9 +13023,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -12479,6 +13031,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -12495,7 +13048,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -12505,7 +13058,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -12542,7 +13095,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -12567,6 +13120,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -12665,18 +13219,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -12727,8 +13274,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -12743,12 +13291,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -12767,6 +13316,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -12778,9 +13328,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -12831,7 +13382,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -12868,8 +13421,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -12891,13 +13445,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -12918,7 +13472,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -12928,12 +13481,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -12943,12 +13495,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -12959,14 +13510,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -13005,15 +13556,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -13024,10 +13593,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -13038,10 +13625,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -13050,17 +13655,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -13068,13 +13689,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -13087,34 +13707,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -13123,23 +13743,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -13158,8 +13778,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -13167,24 +13787,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -13194,14 +13814,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -13209,7 +13826,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -13234,18 +13851,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -13254,14 +13870,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -13278,8 +13894,7 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/package.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "__pdk__": true,
@@ -13301,11 +13916,12 @@ def log_cache_usage(cache_fn):
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -13333,10 +13949,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -13347,7 +13965,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -13457,7 +14075,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -13466,7 +14084,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -13526,9 +14144,10 @@ if __name__ == '__main__':
     unittest.main()
 ",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -13605,7 +14224,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -14189,11 +14808,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -14209,7 +14830,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -14234,7 +14855,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -14553,6 +15174,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -14611,6 +15242,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -14759,16 +15400,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -14792,22 +15433,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -14823,7 +15464,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -14850,22 +15513,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -14885,10 +15555,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -14915,7 +15585,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -14952,7 +15622,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -14968,9 +15638,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/with-docs.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/with-docs.test.ts.snap
index 2d9b73aca..e8a37ba0b 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/with-docs.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-java-project/__snapshots__/with-docs.test.ts.snap
@@ -416,7 +416,7 @@ Like other \`projen\` managed files, this directory should be checked in to sour
   "generated/documentation/html2/.openapi-generator/FILES": ".openapi-generator-ignore
 index.html
 ",
-  "generated/documentation/html2/.openapi-generator/VERSION": "6.0.0",
+  "generated/documentation/html2/.openapi-generator/VERSION": "6.3.0",
   "generated/documentation/html2/index.html": "<!DOCTYPE html>
 <html>
 <head>
@@ -1624,22 +1624,18 @@ pub fn main() {
                                   <div id=\\"responses-Default-sayHello-schema-200\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Successful response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/SayHelloResponseContent\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -1690,22 +1686,18 @@ pub fn main() {
                                   <div id=\\"responses-Default-sayHello-schema-400\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Error response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/ApiErrorResponseContent\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -3515,7 +3507,7 @@ Models/ApiErrorResponseContent.md
 Models/SayHelloResponseContent.md
 README.md
 ",
-  "generated/documentation/markdown/.openapi-generator/VERSION": "6.0.0",
+  "generated/documentation/markdown/.openapi-generator/VERSION": "6.3.0",
   "generated/documentation/markdown/Apis/DefaultApi.md": "# DefaultApi
 
 All URIs are relative to *http://localhost*
@@ -3622,7 +3614,7 @@ All endpoints do not require authorization.
   "generated/documentation/plantuml/.openapi-generator/FILES": ".openapi-generator-ignore
 schemas.plantuml
 ",
-  "generated/documentation/plantuml/.openapi-generator/VERSION": "6.0.0",
+  "generated/documentation/plantuml/.openapi-generator/VERSION": "6.3.0",
   "generated/documentation/plantuml/schemas.plantuml": "@startuml
 
 title Example API Schemas Diagram
@@ -3738,7 +3730,7 @@ src/test/java/com/generated/api/myapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/myapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -3859,17 +3851,17 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -3879,7 +3871,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -3904,7 +3896,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -3919,7 +3911,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -4263,8 +4255,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -4288,7 +4278,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -4340,7 +4330,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -4381,20 +4371,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -4454,19 +4444,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -5644,17 +5635,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -5664,7 +5655,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -5689,7 +5680,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -5705,7 +5696,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -5848,6 +5839,15 @@ import com.generated.api.myapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -5941,6 +5941,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -6065,7 +6092,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -6076,7 +6103,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -6087,7 +6114,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -6098,7 +6125,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -6109,7 +6136,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -6202,6 +6229,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -6370,7 +6409,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -6378,7 +6417,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -6629,7 +6668,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -6663,11 +6702,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -6958,7 +6999,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -7087,11 +7139,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -7125,6 +7178,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -7192,7 +7270,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -7225,7 +7303,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.myapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -7346,7 +7424,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -8265,7 +8343,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -8502,7 +8580,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -8515,15 +8592,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -9652,8 +9726,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -9670,6 +9742,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -9686,7 +9759,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -9700,7 +9773,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -9772,9 +9844,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -9793,7 +9863,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -9871,8 +9941,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -9889,6 +9957,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -9905,7 +9974,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -9919,7 +9988,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -9991,9 +10059,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -10012,7 +10078,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -10135,8 +10201,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -10186,8 +10250,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/monorepo.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/monorepo.test.ts.snap
index 5c246a73f..548c8f1db 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/monorepo.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/monorepo.test.ts.snap
@@ -1335,7 +1335,7 @@ src/test/java/com/generated/api/myapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/myapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "packages/my_api/generated/java/.openapi-generator/VERSION": "6.0.1",
+  "packages/my_api/generated/java/.openapi-generator/VERSION": "6.3.0",
   "packages/my_api/generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -1456,17 +1456,17 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -1476,7 +1476,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -1501,7 +1501,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -1516,7 +1516,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -1852,8 +1852,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -1877,7 +1875,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -1929,7 +1927,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -1970,20 +1968,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -2043,19 +2041,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -3233,17 +3232,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -3253,7 +3252,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -3278,7 +3277,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -3294,7 +3293,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -3437,6 +3436,15 @@ import com.generated.api.myapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -3530,6 +3538,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -3654,7 +3689,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -3665,7 +3700,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -3676,7 +3711,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -3687,7 +3722,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -3698,7 +3733,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -3791,6 +3826,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -3959,7 +4006,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -3967,7 +4014,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -4218,7 +4265,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -4252,11 +4299,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -4547,7 +4596,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -4676,11 +4736,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -4714,6 +4775,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -4781,7 +4867,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -4814,7 +4900,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.myapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -4935,7 +5021,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -5854,7 +5940,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -6091,7 +6177,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -6104,15 +6189,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -7241,8 +7323,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7259,6 +7339,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7275,7 +7356,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -7289,7 +7370,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -7361,9 +7441,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -7382,7 +7460,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -7460,8 +7538,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7478,6 +7554,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7494,7 +7571,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -7508,7 +7585,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -7580,9 +7656,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -7601,7 +7675,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -7724,8 +7798,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7775,8 +7847,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7958,7 +8028,7 @@ test/test_models/test_api_error_response_content.py
 test/test_models/test_say_hello_response_content.py
 tox.ini
 ",
-  "packages/my_api/generated/python/.openapi-generator/VERSION": "6.1.0",
+  "packages/my_api/generated/python/.openapi-generator/VERSION": "6.3.0",
   "packages/my_api/generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -8134,13 +8204,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -8181,6 +8249,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -8261,7 +8339,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import my_api_python
 from pprint import pprint
-from my_api_python.apis import default_api
+from my_api_python.apis.tags import default_api
 from my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -8388,49 +8466,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -8440,22 +8516,32 @@ No authorization required
 ",
   "packages/my_api/generated/python/docs/models/ApiErrorResponseContent.md": "# my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "packages/my_api/generated/python/docs/models/SayHelloResponseContent.md": "# my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -8463,7 +8549,7 @@ Name | Type | Description | Notes
   "packages/my_api/generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -8570,9 +8656,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -8602,6 +8689,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -8844,7 +8933,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -8873,8 +8962,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -8901,7 +9007,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -8948,8 +9053,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -9044,7 +9152,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9062,7 +9170,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -9125,8 +9233,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -9165,12 +9271,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -9229,7 +9340,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9258,7 +9369,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -9270,7 +9381,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -9286,7 +9397,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9325,14 +9436,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -9349,23 +9460,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -9386,6 +9480,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -9405,13 +9512,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -9453,8 +9563,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -9524,7 +9634,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -9581,15 +9691,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -9601,7 +9714,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -9794,7 +9907,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -9866,9 +9979,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -9912,24 +10025,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -9985,7 +10098,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -10019,17 +10132,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "packages/my_api/generated/python/my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "packages/my_api/generated/python/my_api_python/apis/path_to_api.py": "import typing
+  "packages/my_api/generated/python/my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from my_api_python.paths import PathValues
 from my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -10054,12 +10166,12 @@ class Hello(
 ):
     pass
 ",
-  "packages/my_api/generated/python/my_api_python/apis/tag_to_api.py": "import typing
+  "packages/my_api/generated/python/my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from my_api_python.apis.tags import TagValues
 from my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -10407,14 +10519,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -10432,26 +10546,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -10776,6 +10870,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -10865,19 +10963,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -10926,6 +11031,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10947,6 +11053,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -10956,36 +11063,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11008,6 +11115,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11029,6 +11137,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11038,36 +11147,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11090,6 +11199,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11111,6 +11221,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11120,36 +11231,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11172,6 +11283,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11193,6 +11305,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11202,36 +11315,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11245,7 +11358,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from my_api_python.model.pet import Pet
+# from my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -11279,6 +11392,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -11289,6 +11403,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11300,15 +11415,15 @@ from my_api_python.model.api_error_response_content import ApiErrorResponseConte
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -11375,18 +11490,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -11432,7 +11578,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -11440,17 +11590,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -11463,17 +11645,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -11493,6 +11707,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -11503,6 +11718,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11512,34 +11728,126 @@ from my_api_python import schemas  # noqa: F401
 from my_api_python.model.say_hello_response_content import SayHelloResponseContent
 from my_api_python.model.api_error_response_content import ApiErrorResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
 )
 
 
-class BaseApi(api_client.Api):
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
 
-    def _say_hello_oapg(
-        self: api_client.Api,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
         used_path = path.value
 
         prefix_separator_iterator = None
@@ -11579,7 +11887,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -11587,17 +11899,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -11610,17 +11954,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -11779,6 +12155,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -11902,6 +12279,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -11936,17 +12314,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -12034,14 +12412,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -12049,15 +12440,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -12070,9 +12461,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -12081,17 +12480,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -12130,8 +12527,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -12140,21 +12599,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -12164,6 +12610,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -12208,16 +12662,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -12234,7 +12688,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -12322,12 +12776,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -12336,14 +12790,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -12360,7 +12814,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -12378,17 +12832,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -12421,35 +12891,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -12471,7 +13145,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -12483,147 +13157,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -12691,7 +13240,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -12701,7 +13250,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -12716,14 +13265,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -12745,9 +13294,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -12811,9 +13360,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -12844,7 +13393,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -12873,7 +13422,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -12881,7 +13430,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -12939,7 +13488,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -12956,7 +13505,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -12977,7 +13526,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -12987,7 +13536,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -12997,7 +13546,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13007,7 +13556,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -13050,6 +13599,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -13059,6 +13609,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -13074,7 +13625,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -13084,7 +13635,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -13095,7 +13646,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -13183,7 +13734,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -13198,21 +13749,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -13311,9 +13865,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -13321,6 +13873,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -13337,7 +13890,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -13347,7 +13900,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -13384,7 +13937,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -13409,6 +13962,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -13507,18 +14061,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -13569,8 +14116,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -13585,12 +14133,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -13609,6 +14158,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -13620,9 +14170,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -13673,7 +14224,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -13710,8 +14263,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -13733,13 +14287,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -13760,7 +14314,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -13770,12 +14323,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -13785,12 +14337,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -13801,14 +14352,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -13847,15 +14398,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -13866,10 +14435,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -13880,10 +14467,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -13892,17 +14497,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -13910,13 +14531,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -13929,34 +14549,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -13965,23 +14585,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -14000,8 +14620,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -14009,24 +14629,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -14036,14 +14656,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -14051,7 +14668,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -14076,18 +14693,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -14096,14 +14712,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -14120,8 +14736,7 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "packages/my_api/generated/python/package.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "__pdk__": true,
@@ -14144,11 +14759,12 @@ def log_cache_usage(cache_fn):
   "packages/my_api/generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "packages/my_api/generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "packages/my_api/generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "packages/my_api/generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -14176,10 +14792,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -14190,7 +14808,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -14300,7 +14918,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -14309,7 +14927,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -14369,9 +14987,10 @@ if __name__ == '__main__':
     unittest.main()
 ",
   "packages/my_api/generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -14448,7 +15067,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/my_api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/my_api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/my_api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -15027,11 +15646,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -15047,7 +15668,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -15072,7 +15693,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -15391,6 +16012,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -15449,6 +16080,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -15597,16 +16238,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -15630,22 +16271,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -15661,7 +16302,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -15688,22 +16351,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -15723,10 +16393,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -15753,7 +16423,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -15790,7 +16460,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -15806,9 +16476,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/standalone.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/standalone.test.ts.snap
index 0ff72eaeb..e5176dc82 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/standalone.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/standalone.test.ts.snap
@@ -459,7 +459,7 @@ src/test/java/com/generated/api/myapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/myapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -580,17 +580,17 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -600,7 +600,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -625,7 +625,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -640,7 +640,7 @@ src/test/java/com/generated/api/myapijava/client/model/SayHelloResponseContentTe
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -984,8 +984,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -1009,7 +1007,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -1061,7 +1059,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -1102,20 +1100,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -1175,19 +1173,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -2365,17 +2364,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -2385,7 +2384,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -2410,7 +2409,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -2426,7 +2425,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -2569,6 +2568,15 @@ import com.generated.api.myapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -2662,6 +2670,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -2786,7 +2821,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -2797,7 +2832,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -2808,7 +2843,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -2819,7 +2854,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -2830,7 +2865,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.myapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -2923,6 +2958,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -3091,7 +3138,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -3099,7 +3146,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -3350,7 +3397,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -3384,11 +3431,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -3679,7 +3728,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -3808,11 +3868,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -3846,6 +3907,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -3913,7 +3999,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -3946,7 +4032,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.myapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -4067,7 +4153,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -4986,7 +5072,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -5223,7 +5309,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -5236,15 +5321,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -6373,8 +6455,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -6391,6 +6471,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -6407,7 +6488,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -6421,7 +6502,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -6493,9 +6573,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -6514,7 +6592,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -6592,8 +6670,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -6610,6 +6686,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -6626,7 +6703,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -6640,7 +6717,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -6712,9 +6788,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -6733,7 +6807,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -6856,8 +6930,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -6907,8 +6979,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7090,7 +7160,7 @@ test/test_models/test_api_error_response_content.py
 test/test_models/test_say_hello_response_content.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -7263,13 +7333,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -7310,6 +7378,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -7390,7 +7468,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import my_api_python
 from pprint import pprint
-from my_api_python.apis import default_api
+from my_api_python.apis.tags import default_api
 from my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -7517,49 +7595,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -7569,22 +7645,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -7592,7 +7678,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -7699,9 +7785,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -7731,6 +7818,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -7973,7 +8062,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -8002,8 +8091,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -8030,7 +8136,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -8077,8 +8182,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -8173,7 +8281,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -8191,7 +8299,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -8254,8 +8362,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -8294,12 +8400,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -8358,7 +8469,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -8387,7 +8498,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -8399,7 +8510,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -8415,7 +8526,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -8454,14 +8565,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -8478,23 +8589,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -8515,6 +8609,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -8534,13 +8641,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -8582,8 +8692,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -8653,7 +8763,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -8710,15 +8820,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -8730,7 +8843,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -8923,7 +9036,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -8995,9 +9108,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -9041,24 +9154,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -9114,7 +9227,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -9148,17 +9261,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/my_api_python/apis/path_to_api.py": "import typing
+  "generated/python/my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from my_api_python.paths import PathValues
 from my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -9183,12 +9295,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/my_api_python/apis/tag_to_api.py": "import typing
+  "generated/python/my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from my_api_python.apis.tags import TagValues
 from my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -9536,14 +9648,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -9561,26 +9675,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -9905,6 +9999,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -9994,19 +10092,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -10055,6 +10160,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10076,6 +10182,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -10085,36 +10192,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -10137,6 +10244,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10158,6 +10266,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -10167,36 +10276,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -10219,6 +10328,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10240,6 +10350,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -10249,36 +10360,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -10301,6 +10412,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10322,6 +10434,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -10331,36 +10444,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -10374,7 +10487,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from my_api_python.model.pet import Pet
+# from my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -10408,6 +10521,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -10418,6 +10532,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10429,15 +10544,15 @@ from my_api_python.model.api_error_response_content import ApiErrorResponseConte
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -10504,18 +10619,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -10561,7 +10707,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -10569,17 +10719,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -10592,17 +10774,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -10622,6 +10836,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -10632,6 +10847,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -10641,34 +10857,126 @@ from my_api_python import schemas  # noqa: F401
 from my_api_python.model.say_hello_response_content import SayHelloResponseContent
 from my_api_python.model.api_error_response_content import ApiErrorResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
 )
 
 
-class BaseApi(api_client.Api):
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
 
-    def _say_hello_oapg(
-        self: api_client.Api,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
         used_path = path.value
 
         prefix_separator_iterator = None
@@ -10708,7 +11016,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -10716,17 +11028,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -10739,17 +11083,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -10908,6 +11284,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -11031,6 +11408,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -11065,17 +11443,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -11163,14 +11541,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -11178,15 +11569,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -11199,9 +11590,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -11210,17 +11609,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -11259,8 +11656,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -11269,21 +11728,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -11293,6 +11739,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -11337,16 +11791,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -11363,7 +11817,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -11451,12 +11905,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -11465,14 +11919,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -11489,7 +11943,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -11507,17 +11961,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -11550,35 +12020,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -11600,7 +12274,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -11612,147 +12286,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -11820,7 +12369,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -11830,7 +12379,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -11845,14 +12394,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -11874,9 +12423,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -11940,9 +12489,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -11973,7 +12522,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -12002,7 +12551,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -12010,7 +12559,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -12068,7 +12617,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -12085,7 +12634,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -12106,7 +12655,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -12116,7 +12665,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -12126,7 +12675,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -12136,7 +12685,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -12179,6 +12728,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -12188,6 +12738,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -12203,7 +12754,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -12213,7 +12764,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -12224,7 +12775,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -12312,7 +12863,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -12327,21 +12878,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -12440,9 +12994,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -12450,6 +13002,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -12466,7 +13019,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -12476,7 +13029,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -12513,7 +13066,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -12538,6 +13091,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -12636,18 +13190,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -12698,8 +13245,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -12714,12 +13262,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -12738,6 +13287,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -12749,9 +13299,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -12802,7 +13353,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -12839,8 +13392,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -12862,13 +13416,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -12889,7 +13443,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -12899,12 +13452,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -12914,12 +13466,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -12930,14 +13481,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -12976,15 +13527,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -12995,10 +13564,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -13009,10 +13596,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -13021,17 +13626,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -13039,13 +13660,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -13058,34 +13678,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -13094,23 +13714,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -13129,8 +13749,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -13138,24 +13758,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -13165,14 +13785,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -13180,7 +13797,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -13205,18 +13822,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -13225,14 +13841,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -13249,8 +13865,7 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/package.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "__pdk__": true,
@@ -13272,11 +13887,12 @@ def log_cache_usage(cache_fn):
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -13304,10 +13920,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -13318,7 +13936,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -13428,7 +14046,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -13437,7 +14055,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -13497,9 +14115,10 @@ if __name__ == '__main__':
     unittest.main()
 ",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -13576,7 +14195,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -14160,11 +14779,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -14180,7 +14801,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -14205,7 +14826,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -14524,6 +15145,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -14582,6 +15213,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -14730,16 +15371,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -14763,22 +15404,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -14794,7 +15435,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -14821,22 +15484,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -14856,10 +15526,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -14886,7 +15556,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -14923,7 +15593,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -14939,9 +15609,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/with-docs.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/with-docs.test.ts.snap
index b997ab0e2..a74f30dea 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/with-docs.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-python-project/__snapshots__/with-docs.test.ts.snap
@@ -382,7 +382,7 @@ Like other \`projen\` managed files, this directory should be checked in to sour
   "generated/documentation/html2/.openapi-generator/FILES": ".openapi-generator-ignore
 index.html
 ",
-  "generated/documentation/html2/.openapi-generator/VERSION": "6.0.0",
+  "generated/documentation/html2/.openapi-generator/VERSION": "6.3.0",
   "generated/documentation/html2/index.html": "<!DOCTYPE html>
 <html>
 <head>
@@ -1590,22 +1590,18 @@ pub fn main() {
                                   <div id=\\"responses-Default-sayHello-schema-200\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Successful response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/SayHelloResponseContent\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -1656,22 +1652,18 @@ pub fn main() {
                                   <div id=\\"responses-Default-sayHello-schema-400\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Error response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/ApiErrorResponseContent\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -3481,7 +3473,7 @@ Models/ApiErrorResponseContent.md
 Models/SayHelloResponseContent.md
 README.md
 ",
-  "generated/documentation/markdown/.openapi-generator/VERSION": "6.0.0",
+  "generated/documentation/markdown/.openapi-generator/VERSION": "6.3.0",
   "generated/documentation/markdown/Apis/DefaultApi.md": "# DefaultApi
 
 All URIs are relative to *http://localhost*
@@ -3588,7 +3580,7 @@ All endpoints do not require authorization.
   "generated/documentation/plantuml/.openapi-generator/FILES": ".openapi-generator-ignore
 schemas.plantuml
 ",
-  "generated/documentation/plantuml/.openapi-generator/VERSION": "6.0.0",
+  "generated/documentation/plantuml/.openapi-generator/VERSION": "6.3.0",
   "generated/documentation/plantuml/schemas.plantuml": "@startuml
 
 title Example API Schemas Diagram
@@ -3756,7 +3748,7 @@ test/test_models/test_api_error_response_content.py
 test/test_models/test_say_hello_response_content.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -3929,13 +3921,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -3976,6 +3966,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -4056,7 +4056,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import my_api_python
 from pprint import pprint
-from my_api_python.apis import default_api
+from my_api_python.apis.tags import default_api
 from my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -4183,49 +4183,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -4235,22 +4233,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -4258,7 +4266,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -4365,9 +4373,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -4397,6 +4406,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -4639,7 +4650,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -4668,8 +4679,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -4696,7 +4724,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -4743,8 +4770,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -4839,7 +4869,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -4857,7 +4887,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -4920,8 +4950,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -4960,12 +4988,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -5024,7 +5057,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -5053,7 +5086,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -5065,7 +5098,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -5081,7 +5114,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -5120,14 +5153,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -5144,23 +5177,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -5181,6 +5197,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -5200,13 +5229,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -5248,8 +5280,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -5319,7 +5351,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -5376,15 +5408,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -5396,7 +5431,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -5589,7 +5624,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -5661,9 +5696,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -5707,24 +5742,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -5780,7 +5815,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -5814,17 +5849,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/my_api_python/apis/path_to_api.py": "import typing
+  "generated/python/my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from my_api_python.paths import PathValues
 from my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -5849,12 +5883,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/my_api_python/apis/tag_to_api.py": "import typing
+  "generated/python/my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from my_api_python.apis.tags import TagValues
 from my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -6202,14 +6236,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -6227,26 +6263,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -6571,6 +6587,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -6660,19 +6680,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -6721,6 +6748,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -6742,6 +6770,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -6751,36 +6780,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -6803,6 +6832,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -6824,6 +6854,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -6833,36 +6864,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -6885,6 +6916,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -6906,6 +6938,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -6915,36 +6948,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -6967,6 +7000,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -6988,6 +7022,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -6997,36 +7032,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -7040,7 +7075,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from my_api_python.model.pet import Pet
+# from my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -7074,6 +7109,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -7084,6 +7120,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -7095,15 +7132,15 @@ from my_api_python.model.api_error_response_content import ApiErrorResponseConte
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -7170,18 +7207,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -7227,7 +7295,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -7235,17 +7307,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -7258,17 +7362,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -7288,6 +7424,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -7298,6 +7435,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -7307,37 +7445,129 @@ from my_api_python import schemas  # noqa: F401
 from my_api_python.model.say_hello_response_content import SayHelloResponseContent
 from my_api_python.model.api_error_response_content import ApiErrorResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
 SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
-
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
+    ]: ...
 
-        prefix_separator_iterator = None
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+        used_path = path.value
+
+        prefix_separator_iterator = None
         for parameter in (
             request_query_name,
         ):
@@ -7374,7 +7604,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -7382,17 +7616,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -7405,17 +7671,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -7574,6 +7872,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -7697,6 +7996,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -7731,17 +8031,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -7829,14 +8129,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -7844,15 +8157,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -7865,9 +8178,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -7876,17 +8197,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -7925,8 +8244,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -7935,21 +8316,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -7959,6 +8327,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -8003,16 +8379,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -8029,7 +8405,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -8117,12 +8493,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -8131,14 +8507,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -8155,7 +8531,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -8173,17 +8549,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -8216,35 +8608,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -8266,7 +8862,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -8278,147 +8874,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -8486,7 +8957,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -8496,7 +8967,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -8511,14 +8982,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -8540,9 +9011,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -8606,9 +9077,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -8639,7 +9110,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -8668,7 +9139,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -8676,7 +9147,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -8734,7 +9205,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -8751,7 +9222,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -8772,7 +9243,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -8782,7 +9253,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -8792,7 +9263,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -8802,7 +9273,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -8845,6 +9316,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -8854,6 +9326,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -8869,7 +9342,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -8879,7 +9352,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -8890,7 +9363,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -8978,7 +9451,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -8993,21 +9466,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -9106,9 +9582,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -9116,6 +9590,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -9132,7 +9607,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -9142,7 +9617,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -9179,7 +9654,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -9204,6 +9679,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -9302,18 +9778,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -9364,8 +9833,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -9380,12 +9850,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -9404,6 +9875,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -9415,9 +9887,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -9468,7 +9941,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -9505,8 +9980,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -9528,13 +10004,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -9555,7 +10031,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -9565,12 +10040,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -9580,12 +10054,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -9596,14 +10069,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -9642,15 +10115,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -9661,10 +10152,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -9675,10 +10184,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -9687,17 +10214,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
 
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -9705,13 +10248,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -9724,34 +10266,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -9760,23 +10302,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -9795,8 +10337,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -9804,24 +10346,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -9831,14 +10373,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -9846,7 +10385,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -9871,18 +10410,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -9891,14 +10429,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -9915,8 +10453,7 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/package.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "__pdk__": true,
@@ -9938,11 +10475,12 @@ def log_cache_usage(cache_fn):
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -9970,10 +10508,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -9984,7 +10524,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -10094,7 +10634,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -10103,7 +10643,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -10163,9 +10703,10 @@ if __name__ == '__main__':
     unittest.main()
 ",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/custom-directories.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/custom-directories.test.ts.snap
index d058d840d..e8fbd13f1 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/custom-directories.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/custom-directories.test.ts.snap
@@ -1280,7 +1280,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "gen/typescript/.openapi-generator/VERSION": "6.0.0",
+  "gen/typescript/.openapi-generator/VERSION": "6.3.0",
   "gen/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -1864,11 +1864,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -1884,7 +1886,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -1909,7 +1911,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -2228,6 +2230,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -2286,6 +2298,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -2434,16 +2456,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -2467,22 +2489,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -2498,7 +2520,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -2525,22 +2569,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -2560,10 +2611,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -2590,7 +2641,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -2627,7 +2678,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -2643,9 +2694,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/monorepo.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/monorepo.test.ts.snap
index f81fff256..7bf3a22b8 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/monorepo.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/monorepo.test.ts.snap
@@ -1839,7 +1839,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "packages/api/generated/java/.openapi-generator/VERSION": "6.0.1",
+  "packages/api/generated/java/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -1960,17 +1960,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -1980,7 +1980,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -2005,7 +2005,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -2020,7 +2020,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -2356,8 +2356,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -2381,7 +2379,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -2433,7 +2431,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -2474,20 +2472,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -2547,19 +2545,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -3737,17 +3736,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -3757,7 +3756,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -3782,7 +3781,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -3798,7 +3797,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -3941,6 +3940,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -4034,6 +4042,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -4158,7 +4193,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -4169,7 +4204,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -4180,7 +4215,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -4191,7 +4226,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -4202,7 +4237,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -4295,6 +4330,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -4463,7 +4510,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -4471,7 +4518,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -4722,7 +4769,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -4756,11 +4803,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -5051,7 +5100,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -5180,11 +5240,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -5218,6 +5279,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -5285,7 +5371,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -5318,7 +5404,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -5439,7 +5525,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -6358,7 +6444,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -6595,7 +6681,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -6608,15 +6693,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -7745,8 +7827,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7763,6 +7843,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7779,7 +7860,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -7793,7 +7874,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -7865,9 +7945,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -7886,7 +7964,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -7964,8 +8042,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7982,6 +8058,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7998,7 +8075,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -8012,7 +8089,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -8084,9 +8160,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -8105,7 +8179,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -8228,8 +8302,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -8279,8 +8351,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -8462,7 +8532,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "packages/api/generated/python/.openapi-generator/VERSION": "6.1.0",
+  "packages/api/generated/python/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -8627,13 +8697,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -8674,6 +8742,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -8754,7 +8832,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -8881,49 +8959,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -8933,22 +9009,32 @@ No authorization required
 ",
   "packages/api/generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "packages/api/generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -8956,7 +9042,7 @@ Name | Type | Description | Notes
   "packages/api/generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -9034,11 +9120,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "packages/api/generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "packages/api/generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "packages/api/generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "packages/api/generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -9066,10 +9153,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -9080,7 +9169,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -9190,7 +9279,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -9199,7 +9288,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -9309,9 +9398,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -9341,6 +9431,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -9583,7 +9675,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -9612,8 +9704,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -9640,7 +9749,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -9687,8 +9795,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -9783,7 +9894,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9801,7 +9912,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -9864,8 +9975,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -9904,12 +10013,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -9968,7 +10082,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9997,7 +10111,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -10009,7 +10123,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -10025,7 +10139,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -10064,14 +10178,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -10088,23 +10202,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -10125,6 +10222,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -10144,13 +10254,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -10192,8 +10305,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -10263,7 +10376,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -10320,15 +10433,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -10340,7 +10456,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -10533,7 +10649,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -10605,9 +10721,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -10651,24 +10767,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -10724,7 +10840,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -10758,17 +10874,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "packages/api/generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -10793,12 +10908,12 @@ class Hello(
 ):
     pass
 ",
-  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -11146,14 +11261,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -11171,26 +11288,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -11515,6 +11612,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -11604,19 +11705,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -11665,6 +11773,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11686,6 +11795,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11695,36 +11805,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11747,6 +11857,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11768,6 +11879,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11777,36 +11889,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11829,6 +11941,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11850,6 +11963,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11859,36 +11973,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11911,6 +12025,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11932,6 +12047,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11941,36 +12057,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11984,7 +12100,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -12018,6 +12134,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -12028,6 +12145,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -12039,15 +12157,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -12114,165 +12232,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
-
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_name,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
+    ]: ...
 
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SayHello(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    def say_hello(
-        self: BaseApi,
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    def get(
-        self: BaseApi,
+    @typing.overload
+    def _say_hello_oapg(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-",
-  "packages/api/generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
-
-\\"\\"\\"
-
-
-    Generated by: https://openapi-generator.tech
-\\"\\"\\"
-
-from dataclasses import dataclass
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from test_my_api_python import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from test_my_api_python import schemas  # noqa: F401
-
-from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
-from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
-
-# query params
-NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -12318,7 +12320,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -12326,17 +12332,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -12349,17 +12387,358 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
     def get(
-        self: BaseApi,
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "packages/api/generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+
+from test_my_api_python import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test_my_api_python import schemas  # noqa: F401
+
+from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
+from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
+
+# Query params
+NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+        used_path = path.value
+
+        prefix_separator_iterator = None
+        for parameter in (
+            request_query_name,
+        ):
+            parameter_data = query_params.get(parameter.name, schemas.unset)
+            if parameter_data is schemas.unset:
+                continue
+            if prefix_separator_iterator is None:
+                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
+            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
+            for serialized_value in serialized_data.values():
+                used_path += serialized_value
+
+        _headers = HTTPHeaderDict()
+        # TODO add cookie handling
+        if accept_content_types:
+            for accept_content_type in accept_content_types:
+                _headers.add('Accept', accept_content_type)
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            headers=_headers,
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class SayHello(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -12518,6 +12897,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -12641,6 +13021,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -12675,17 +13056,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -12773,14 +13154,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -12788,15 +13182,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -12809,9 +13203,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -12820,17 +13222,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -12869,8 +13269,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -12879,21 +13341,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -12903,6 +13352,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -12947,16 +13404,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -12973,7 +13430,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -13061,12 +13518,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -13075,14 +13532,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -13099,7 +13556,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -13117,17 +13574,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -13160,35 +13633,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -13210,7 +13887,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -13222,147 +13899,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -13430,7 +13982,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -13440,7 +13992,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -13455,14 +14007,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -13484,9 +14036,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -13550,9 +14102,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -13583,7 +14135,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -13612,7 +14164,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -13620,7 +14172,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -13678,7 +14230,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -13695,7 +14247,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -13716,7 +14268,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13726,7 +14278,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -13736,7 +14288,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13746,7 +14298,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -13789,6 +14341,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -13798,6 +14351,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -13813,7 +14367,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -13823,7 +14377,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -13834,7 +14388,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -13922,7 +14476,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -13937,21 +14491,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -14050,9 +14607,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -14060,6 +14615,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -14076,7 +14632,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -14086,7 +14642,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -14123,7 +14679,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -14148,6 +14704,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -14246,18 +14803,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -14308,8 +14858,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -14324,12 +14875,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -14348,6 +14900,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -14359,9 +14912,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -14412,7 +14966,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -14449,8 +15005,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -14472,13 +15029,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -14499,7 +15056,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -14509,12 +15065,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -14524,12 +15079,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -14540,14 +15094,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -14586,15 +15140,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -14605,10 +15177,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -14619,10 +15209,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -14631,17 +15239,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -14649,13 +15273,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -14668,34 +15291,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -14704,23 +15327,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -14739,8 +15362,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -14748,24 +15371,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -14775,14 +15398,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -14790,7 +15410,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -14815,18 +15435,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -14835,14 +15454,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -14859,12 +15478,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "packages/api/generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -14941,7 +15560,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -15525,11 +16144,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -15545,7 +16166,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -15570,7 +16191,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -15889,6 +16510,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -15947,6 +16578,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -16095,16 +16736,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -16128,22 +16769,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -16159,7 +16800,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -16186,22 +16849,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -16221,10 +16891,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -16251,7 +16921,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -16288,7 +16958,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -16304,9 +16974,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -18718,7 +19397,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "packages/api/generated/java/.openapi-generator/VERSION": "6.0.1",
+  "packages/api/generated/java/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -18839,17 +19518,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -18859,7 +19538,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -18884,7 +19563,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -18899,7 +19578,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -19235,8 +19914,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -19260,7 +19937,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -19312,7 +19989,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -19353,20 +20030,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -19426,19 +20103,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -20616,17 +21294,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -20636,7 +21314,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -20661,7 +21339,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -20677,7 +21355,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -20820,6 +21498,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -20913,6 +21600,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -21037,7 +21751,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -21048,7 +21762,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -21059,7 +21773,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -21070,7 +21784,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -21081,7 +21795,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -21174,6 +21888,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -21342,7 +22068,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -21350,7 +22076,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -21601,7 +22327,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -21635,11 +22361,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -21930,7 +22658,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -22059,11 +22798,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -22097,6 +22837,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -22164,7 +22929,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -22197,7 +22962,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -22318,7 +23083,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -23237,7 +24002,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -23474,7 +24239,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -23487,15 +24251,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -24624,8 +25385,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -24642,6 +25401,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -24658,7 +25418,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -24672,7 +25432,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -24744,9 +25503,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -24765,7 +25522,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -24843,8 +25600,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -24861,6 +25616,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -24877,7 +25633,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -24891,7 +25647,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -24963,9 +25718,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -24984,7 +25737,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -25107,8 +25860,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -25158,8 +25909,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -25341,7 +26090,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "packages/api/generated/python/.openapi-generator/VERSION": "6.1.0",
+  "packages/api/generated/python/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -25506,13 +26255,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -25553,6 +26300,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -25633,7 +26390,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -25760,49 +26517,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -25812,22 +26567,32 @@ No authorization required
 ",
   "packages/api/generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "packages/api/generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -25835,7 +26600,7 @@ Name | Type | Description | Notes
   "packages/api/generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -25913,11 +26678,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "packages/api/generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "packages/api/generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "packages/api/generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "packages/api/generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -25945,10 +26711,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -25959,7 +26727,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -26069,7 +26837,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -26078,7 +26846,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -26188,9 +26956,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -26220,6 +26989,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -26462,7 +27233,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -26491,8 +27262,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -26519,7 +27307,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -26566,8 +27353,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -26662,7 +27452,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -26680,7 +27470,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -26743,8 +27533,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -26783,12 +27571,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -26847,7 +27640,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -26876,7 +27669,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -26888,7 +27681,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -26904,7 +27697,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -26943,14 +27736,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -26967,23 +27760,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -27004,6 +27780,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -27023,13 +27812,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -27071,8 +27863,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -27142,7 +27934,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -27199,15 +27991,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -27219,7 +28014,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -27412,7 +28207,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -27484,9 +28279,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -27530,24 +28325,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -27603,7 +28398,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -27637,17 +28432,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "packages/api/generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -27672,12 +28466,12 @@ class Hello(
 ):
     pass
 ",
-  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -28025,14 +28819,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -28050,26 +28846,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -28394,6 +29170,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -28483,19 +29263,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -28544,6 +29331,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -28565,6 +29353,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -28574,36 +29363,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -28626,6 +29415,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -28647,6 +29437,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -28656,36 +29447,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -28708,6 +29499,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -28729,6 +29521,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -28738,36 +29531,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -28790,6 +29583,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -28811,6 +29605,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -28820,36 +29615,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -28863,7 +29658,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -28897,6 +29692,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -28907,6 +29703,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -28918,15 +29715,328 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
+NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_status_code_to_response = {
+    '200': _response_for_200,
+    '400': _response_for_400,
+}
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+        used_path = path.value
+
+        prefix_separator_iterator = None
+        for parameter in (
+            request_query_name,
+        ):
+            parameter_data = query_params.get(parameter.name, schemas.unset)
+            if parameter_data is schemas.unset:
+                continue
+            if prefix_separator_iterator is None:
+                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
+            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
+            for serialized_value in serialized_data.values():
+                used_path += serialized_value
+
+        _headers = HTTPHeaderDict()
+        # TODO add cookie handling
+        if accept_content_types:
+            for accept_content_type in accept_content_types:
+                _headers.add('Accept', accept_content_type)
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            headers=_headers,
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class SayHello(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "packages/api/generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+
+from test_my_api_python import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test_my_api_python import schemas  # noqa: F401
+
+from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
+from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
+
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -28983,28 +30093,55 @@ _response_for_400 = api_client.OpenApiResponse(
             schema=SchemaFor400ResponseBodyApplicationJson),
     },
 )
-_status_code_to_response = {
-    '200': _response_for_200,
-    '400': _response_for_400,
-}
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -29050,7 +30187,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -29058,40 +30199,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
+    ]: ...
 
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    def get(
-        self: BaseApi,
+    @typing.overload
+    def say_hello(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -29101,144 +30251,52 @@ class ApiForget(BaseApi):
         )
 
 
-",
-  "packages/api/generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
-
-\\"\\"\\"
-
-
-    Generated by: https://openapi-generator.tech
-\\"\\"\\"
-
-from dataclasses import dataclass
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from test_my_api_python import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from test_my_api_python import schemas  # noqa: F401
-
-from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
-from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
-
-# query params
-NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
 
-    def _say_hello_oapg(
-        self: api_client.Api,
+    @typing.overload
+    def get(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_name,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+    ]: ...
 
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SayHello(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-    def say_hello(
-        self: BaseApi,
+    @typing.overload
+    def get(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -29397,6 +30455,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -29520,6 +30579,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -29554,17 +30614,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -29652,14 +30712,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -29667,15 +30740,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -29688,9 +30761,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -29699,17 +30780,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -29748,8 +30827,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -29758,21 +30899,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -29782,6 +30910,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -29826,16 +30962,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -29852,7 +30988,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -29940,12 +31076,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -29954,14 +31090,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -29978,7 +31114,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -29996,17 +31132,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -30039,35 +31191,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -30089,7 +31445,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -30101,147 +31457,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -30309,7 +31540,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -30319,7 +31550,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -30334,14 +31565,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -30363,9 +31594,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -30429,9 +31660,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -30462,7 +31693,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -30491,7 +31722,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -30499,7 +31730,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -30557,7 +31788,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -30574,7 +31805,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -30595,7 +31826,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -30605,7 +31836,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -30615,7 +31846,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -30625,7 +31856,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -30668,6 +31899,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -30677,6 +31909,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -30692,7 +31925,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -30702,7 +31935,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -30713,7 +31946,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -30801,7 +32034,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -30816,21 +32049,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -30929,9 +32165,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -30939,6 +32173,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -30955,7 +32190,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -30965,7 +32200,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -31002,7 +32237,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -31027,6 +32262,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -31125,18 +32361,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -31187,8 +32416,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -31203,12 +32433,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -31227,6 +32458,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -31238,9 +32470,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -31291,7 +32524,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -31328,8 +32563,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -31351,13 +32587,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -31378,7 +32614,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -31388,12 +32623,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -31403,12 +32637,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -31419,14 +32652,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -31465,15 +32698,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -31484,10 +32735,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -31498,10 +32767,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -31510,17 +32797,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -31528,13 +32831,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -31547,34 +32849,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -31583,23 +32885,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -31618,8 +32920,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -31627,24 +32929,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -31654,14 +32956,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -31669,7 +32968,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -31694,18 +32993,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -31714,14 +33012,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -31738,12 +33036,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "packages/api/generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -31825,7 +33123,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -32410,11 +33708,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -32430,7 +33730,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -32455,7 +33755,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -32774,6 +34074,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -32832,6 +34142,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -32980,16 +34300,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -33013,22 +34333,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -33044,7 +34364,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -33071,22 +34413,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -33106,10 +34455,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -33136,7 +34485,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -33173,7 +34522,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -33189,9 +34538,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -35611,7 +36969,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "packages/api/generated/java/.openapi-generator/VERSION": "6.0.1",
+  "packages/api/generated/java/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -35732,17 +37090,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -35752,7 +37110,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -35777,7 +37135,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -35792,7 +37150,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -36128,8 +37486,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -36153,7 +37509,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -36205,7 +37561,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -36246,20 +37602,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -36319,19 +37675,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -37509,17 +38866,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -37529,7 +38886,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -37554,7 +38911,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -37570,7 +38927,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -37713,6 +39070,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -37806,6 +39172,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -37930,7 +39323,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -37941,7 +39334,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -37952,7 +39345,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -37963,7 +39356,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -37974,7 +39367,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -38067,6 +39460,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -38235,7 +39640,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -38243,7 +39648,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -38494,7 +39899,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -38528,11 +39933,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -38823,7 +40230,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -38952,11 +40370,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -38990,6 +40409,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -39057,7 +40501,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -39090,7 +40534,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -39211,7 +40655,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -40130,7 +41574,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -40367,7 +41811,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -40380,15 +41823,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -41517,8 +42957,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -41535,6 +42973,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -41551,7 +42990,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -41565,7 +43004,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -41637,9 +43075,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -41658,7 +43094,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -41736,8 +43172,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -41754,6 +43188,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -41770,7 +43205,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -41784,7 +43219,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -41856,9 +43290,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -41877,7 +43309,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -42000,8 +43432,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -42051,8 +43481,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -42234,7 +43662,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "packages/api/generated/python/.openapi-generator/VERSION": "6.1.0",
+  "packages/api/generated/python/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -42399,13 +43827,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -42446,6 +43872,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -42526,7 +43962,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -42653,48 +44089,46 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
 
 ### Authorization
 
@@ -42705,22 +44139,32 @@ No authorization required
 ",
   "packages/api/generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "packages/api/generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -42728,7 +44172,7 @@ Name | Type | Description | Notes
   "packages/api/generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -42806,11 +44250,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "packages/api/generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "packages/api/generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "packages/api/generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "packages/api/generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -42838,10 +44283,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -42852,7 +44299,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -42962,7 +44409,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -42971,7 +44418,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -43081,9 +44528,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -43113,6 +44561,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -43355,7 +44805,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -43384,8 +44834,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -43412,7 +44879,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -43459,8 +44925,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -43555,7 +45024,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -43573,7 +45042,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -43636,8 +45105,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -43676,12 +45143,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -43740,7 +45212,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -43769,7 +45241,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -43781,7 +45253,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -43797,7 +45269,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -43836,14 +45308,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -43860,23 +45332,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -43897,6 +45352,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -43916,13 +45384,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -43964,8 +45435,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -44035,7 +45506,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -44092,15 +45563,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -44112,7 +45586,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -44305,7 +45779,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -44377,9 +45851,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -44423,24 +45897,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -44496,7 +45970,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -44530,17 +46004,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "packages/api/generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -44565,12 +46038,12 @@ class Hello(
 ):
     pass
 ",
-  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -44918,14 +46391,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -44943,26 +46418,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -45287,6 +46742,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -45376,19 +46835,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -45437,6 +46903,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -45458,6 +46925,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -45467,36 +46935,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -45519,6 +46987,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -45540,6 +47009,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -45549,36 +47019,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -45601,6 +47071,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -45622,6 +47093,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -45631,36 +47103,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -45683,6 +47155,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -45704,6 +47177,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -45713,36 +47187,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -45756,7 +47230,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -45790,6 +47264,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -45800,6 +47275,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -45811,15 +47287,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -45886,18 +47362,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -45943,7 +47450,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -45951,17 +47462,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -45974,17 +47517,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -46004,6 +47579,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -46014,6 +47590,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46023,28 +47600,120 @@ from test_my_api_python import schemas  # noqa: F401
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
 SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -46090,7 +47759,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -46098,17 +47771,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -46121,17 +47826,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -46290,6 +48027,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -46413,6 +48151,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -46447,17 +48186,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -46545,14 +48284,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -46560,15 +48312,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -46581,9 +48333,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -46592,17 +48352,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -46641,8 +48399,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -46651,21 +48471,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -46675,6 +48482,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -46719,16 +48534,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -46745,7 +48560,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -46833,12 +48648,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -46847,14 +48662,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -46871,7 +48686,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -46889,17 +48704,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -46932,35 +48763,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -46982,7 +49017,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -46994,147 +49029,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -47202,7 +49112,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -47212,7 +49122,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -47227,14 +49137,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -47256,9 +49166,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -47322,9 +49232,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -47355,7 +49265,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -47384,7 +49294,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -47392,7 +49302,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -47450,7 +49360,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -47467,7 +49377,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -47488,7 +49398,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -47498,7 +49408,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -47508,7 +49418,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -47518,7 +49428,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -47561,6 +49471,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -47570,6 +49481,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -47585,7 +49497,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -47595,7 +49507,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -47606,7 +49518,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -47694,7 +49606,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -47709,21 +49621,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -47822,9 +49737,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -47832,6 +49745,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -47848,7 +49762,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -47858,7 +49772,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -47895,7 +49809,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -47920,6 +49834,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -48018,18 +49933,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -48080,8 +49988,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -48096,12 +50005,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -48120,6 +50030,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -48131,9 +50042,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -48184,7 +50096,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -48221,8 +50135,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -48244,13 +50159,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -48271,7 +50186,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -48281,12 +50195,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -48296,12 +50209,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -48312,14 +50224,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -48358,15 +50270,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -48377,10 +50307,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -48391,10 +50339,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -48403,17 +50369,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -48421,13 +50403,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -48440,34 +50421,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -48476,23 +50457,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -48511,8 +50492,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -48520,24 +50501,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -48547,14 +50528,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -48562,7 +50540,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -48587,18 +50565,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -48607,14 +50584,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -48631,12 +50608,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "packages/api/generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -48713,7 +50690,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -49297,11 +51274,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -49317,7 +51296,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -49342,7 +51321,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -49661,6 +51640,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -49719,6 +51708,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -49867,16 +51866,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -49900,22 +51899,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -49931,7 +51930,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -49958,22 +51979,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -49993,10 +52021,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -50023,7 +52051,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -50060,7 +52088,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -50076,9 +52104,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -52490,7 +54527,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "packages/api/generated/java/.openapi-generator/VERSION": "6.0.1",
+  "packages/api/generated/java/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -52611,17 +54648,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -52631,7 +54668,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -52656,7 +54693,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -52671,7 +54708,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -53007,8 +55044,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -53032,7 +55067,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -53084,7 +55119,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -53125,20 +55160,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -53198,19 +55233,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -54388,17 +56424,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -54408,7 +56444,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -54433,7 +56469,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -54449,7 +56485,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -54592,6 +56628,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -54685,6 +56730,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -54809,7 +56881,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -54820,7 +56892,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -54831,7 +56903,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -54842,7 +56914,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -54853,7 +56925,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -54946,6 +57018,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -55114,7 +57198,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -55122,7 +57206,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -55373,7 +57457,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -55407,11 +57491,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -55702,7 +57788,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -55831,11 +57928,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -55869,6 +57967,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -55936,7 +58059,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -55969,7 +58092,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -56090,7 +58213,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -57009,7 +59132,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -57246,7 +59369,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -57259,15 +59381,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -58396,8 +60515,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -58414,6 +60531,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -58430,7 +60548,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -58444,7 +60562,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -58516,9 +60633,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -58537,7 +60652,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -58615,8 +60730,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -58633,6 +60746,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -58649,7 +60763,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -58663,7 +60777,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -58735,9 +60848,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -58756,7 +60867,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -58879,8 +60990,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -58930,8 +61039,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -59113,7 +61220,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "packages/api/generated/python/.openapi-generator/VERSION": "6.1.0",
+  "packages/api/generated/python/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -59278,13 +61385,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -59325,6 +61430,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -59405,7 +61520,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -59532,49 +61647,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -59584,22 +61697,32 @@ No authorization required
 ",
   "packages/api/generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "packages/api/generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -59607,7 +61730,7 @@ Name | Type | Description | Notes
   "packages/api/generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -59685,11 +61808,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "packages/api/generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "packages/api/generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "packages/api/generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "packages/api/generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -59717,10 +61841,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -59731,7 +61857,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -59841,7 +61967,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -59850,7 +61976,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -59960,9 +62086,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -59992,6 +62119,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -60234,7 +62363,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -60263,8 +62392,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -60291,7 +62437,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -60338,8 +62483,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -60434,7 +62582,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -60452,7 +62600,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -60515,8 +62663,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -60555,12 +62701,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -60619,7 +62770,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -60648,7 +62799,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -60660,7 +62811,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -60676,7 +62827,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -60715,14 +62866,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -60739,23 +62890,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -60776,6 +62910,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -60795,13 +62942,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -60843,8 +62993,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -60914,7 +63064,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -60971,15 +63121,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -60991,7 +63144,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -61184,7 +63337,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -61256,9 +63409,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -61302,24 +63455,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -61375,7 +63528,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -61409,17 +63562,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "packages/api/generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -61444,12 +63596,12 @@ class Hello(
 ):
     pass
 ",
-  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -61797,14 +63949,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -61822,26 +63976,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -62166,6 +64300,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -62255,19 +64393,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -62316,6 +64461,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -62337,6 +64483,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -62346,36 +64493,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -62398,6 +64545,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -62419,6 +64567,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -62428,36 +64577,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -62480,6 +64629,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -62501,6 +64651,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -62510,36 +64661,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -62562,6 +64713,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -62583,6 +64735,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -62592,36 +64745,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -62635,7 +64788,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -62669,6 +64822,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -62679,6 +64833,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -62690,15 +64845,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -62765,18 +64920,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -62822,7 +65008,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -62830,17 +65020,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -62853,17 +65075,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -62883,6 +65137,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -62893,6 +65148,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -62902,28 +65158,120 @@ from test_my_api_python import schemas  # noqa: F401
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
 SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -62969,7 +65317,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -62977,17 +65329,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -63000,17 +65384,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -63169,6 +65585,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -63292,6 +65709,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -63326,17 +65744,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -63424,14 +65842,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -63439,15 +65870,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -63460,9 +65891,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -63471,17 +65910,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -63520,8 +65957,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -63530,21 +66029,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -63554,6 +66040,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -63598,16 +66092,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -63624,7 +66118,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -63712,12 +66206,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -63726,14 +66220,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -63750,7 +66244,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -63768,17 +66262,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -63811,35 +66321,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -63861,7 +66575,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -63873,147 +66587,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -64081,7 +66670,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -64091,7 +66680,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -64106,14 +66695,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -64135,9 +66724,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -64201,9 +66790,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -64234,7 +66823,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -64263,7 +66852,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -64271,7 +66860,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -64329,7 +66918,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -64346,7 +66935,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -64367,7 +66956,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -64377,7 +66966,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -64387,7 +66976,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -64397,7 +66986,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -64440,6 +67029,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -64449,6 +67039,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -64464,7 +67055,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -64474,7 +67065,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -64485,7 +67076,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -64573,7 +67164,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -64588,21 +67179,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -64701,9 +67295,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -64711,6 +67303,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -64727,7 +67320,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -64737,7 +67330,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -64774,7 +67367,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -64799,6 +67392,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -64897,18 +67491,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -64959,8 +67546,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -64975,12 +67563,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -64999,6 +67588,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -65010,9 +67600,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -65063,7 +67654,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -65100,8 +67693,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -65123,13 +67717,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -65150,7 +67744,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -65160,12 +67753,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -65175,12 +67767,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -65191,14 +67782,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -65237,15 +67828,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -65256,10 +67865,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -65270,10 +67897,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -65282,17 +67927,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -65300,13 +67961,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -65319,34 +67979,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -65355,23 +68015,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -65390,8 +68050,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -65399,24 +68059,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -65426,14 +68086,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -65441,7 +68098,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -65466,18 +68123,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -65486,14 +68142,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -65510,12 +68166,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "packages/api/generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -65592,7 +68248,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -66176,11 +68832,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -66196,7 +68854,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -66221,7 +68879,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -66540,6 +69198,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -66598,6 +69266,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -66746,16 +69424,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -66779,22 +69457,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -66810,7 +69488,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -66837,22 +69537,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -66872,10 +69579,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -66902,7 +69609,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -66939,7 +69646,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -66955,9 +69662,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/standalone.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/standalone.test.ts.snap
index 3ac8bcd17..b61abda44 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/standalone.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/standalone.test.ts.snap
@@ -1315,7 +1315,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -1436,17 +1436,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -1456,7 +1456,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -1481,7 +1481,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -1496,7 +1496,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -1840,8 +1840,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -1865,7 +1863,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -1917,7 +1915,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -1958,20 +1956,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -2031,19 +2029,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -3221,17 +3220,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -3241,7 +3240,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -3266,7 +3265,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -3282,7 +3281,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -3425,6 +3424,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -3518,6 +3526,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -3642,7 +3677,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -3653,7 +3688,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -3664,7 +3699,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -3675,7 +3710,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -3686,7 +3721,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -3779,6 +3814,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -3947,7 +3994,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -3955,7 +4002,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -4206,7 +4253,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -4240,11 +4287,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -4535,7 +4584,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -4664,11 +4724,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -4702,6 +4763,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -4769,7 +4855,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -4802,7 +4888,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -4923,7 +5009,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -5842,7 +5928,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -6079,7 +6165,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -6092,15 +6177,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -7229,8 +7311,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7247,6 +7327,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7263,7 +7344,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -7277,7 +7358,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -7349,9 +7429,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -7370,7 +7448,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -7448,8 +7526,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7466,6 +7542,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7482,7 +7559,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -7496,7 +7573,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -7568,9 +7644,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -7589,7 +7663,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -7712,8 +7786,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7763,8 +7835,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7946,7 +8016,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -8113,13 +8183,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -8160,6 +8228,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -8240,7 +8318,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -8367,49 +8445,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -8419,22 +8495,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -8442,7 +8528,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -8519,11 +8605,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -8551,10 +8638,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -8565,7 +8654,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -8675,7 +8764,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -8684,7 +8773,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -8794,9 +8883,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -8826,6 +8916,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -9068,7 +9160,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -9097,8 +9189,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -9125,7 +9234,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -9172,8 +9280,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -9268,7 +9379,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9286,7 +9397,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -9349,8 +9460,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -9389,12 +9498,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -9453,7 +9567,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9482,7 +9596,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -9494,7 +9608,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -9510,7 +9624,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9549,14 +9663,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -9573,23 +9687,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -9610,6 +9707,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -9629,13 +9739,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -9677,8 +9790,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -9748,7 +9861,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -9805,15 +9918,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -9825,7 +9941,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -10018,7 +10134,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -10090,9 +10206,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -10136,24 +10252,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -10209,7 +10325,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -10243,17 +10359,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -10278,12 +10393,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -10631,14 +10746,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -10656,26 +10773,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -11000,6 +11097,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -11089,19 +11190,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -11150,6 +11258,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11171,6 +11280,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11180,36 +11290,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11232,6 +11342,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11253,6 +11364,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11262,36 +11374,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11314,6 +11426,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11335,6 +11448,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11344,36 +11458,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11396,6 +11510,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11417,6 +11532,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11426,36 +11542,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11469,7 +11585,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -11503,6 +11619,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -11513,6 +11630,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11524,15 +11642,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -11599,165 +11717,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
-
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_name,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
+    ]: ...
 
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SayHello(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    def say_hello(
-        self: BaseApi,
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    def get(
-        self: BaseApi,
+    @typing.overload
+    def _say_hello_oapg(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-",
-  "generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
-
-\\"\\"\\"
-
-
-    Generated by: https://openapi-generator.tech
-\\"\\"\\"
-
-from dataclasses import dataclass
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from test_my_api_python import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from test_my_api_python import schemas  # noqa: F401
-
-from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
-from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
-
-# query params
-NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -11803,7 +11805,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -11811,17 +11817,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -11834,17 +11872,358 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
     def get(
-        self: BaseApi,
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+
+from test_my_api_python import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test_my_api_python import schemas  # noqa: F401
+
+from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
+from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
+
+# Query params
+NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+        used_path = path.value
+
+        prefix_separator_iterator = None
+        for parameter in (
+            request_query_name,
+        ):
+            parameter_data = query_params.get(parameter.name, schemas.unset)
+            if parameter_data is schemas.unset:
+                continue
+            if prefix_separator_iterator is None:
+                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
+            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
+            for serialized_value in serialized_data.values():
+                used_path += serialized_value
+
+        _headers = HTTPHeaderDict()
+        # TODO add cookie handling
+        if accept_content_types:
+            for accept_content_type in accept_content_types:
+                _headers.add('Accept', accept_content_type)
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            headers=_headers,
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class SayHello(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -12003,6 +12382,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -12126,6 +12506,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -12160,17 +12541,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -12258,14 +12639,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -12273,15 +12667,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -12294,9 +12688,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -12305,17 +12707,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -12354,8 +12754,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -12364,21 +12826,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -12388,6 +12837,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -12432,16 +12889,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -12458,7 +12915,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -12546,12 +13003,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -12560,14 +13017,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -12584,7 +13041,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -12602,17 +13059,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -12645,35 +13118,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -12695,7 +13372,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -12707,147 +13384,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -12915,7 +13467,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -12925,7 +13477,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -12940,14 +13492,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -12969,9 +13521,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -13035,9 +13587,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -13068,7 +13620,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -13097,7 +13649,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -13105,7 +13657,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -13163,7 +13715,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -13180,7 +13732,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -13201,7 +13753,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13211,7 +13763,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -13221,7 +13773,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13231,7 +13783,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -13274,6 +13826,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -13283,6 +13836,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -13298,7 +13852,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -13308,7 +13862,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -13319,7 +13873,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -13407,7 +13961,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -13422,21 +13976,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -13535,9 +14092,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -13545,6 +14100,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -13561,7 +14117,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -13571,7 +14127,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -13608,7 +14164,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -13633,6 +14189,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -13731,18 +14288,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -13793,8 +14343,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -13809,12 +14360,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -13833,6 +14385,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -13844,9 +14397,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -13897,7 +14451,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -13934,8 +14490,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -13957,13 +14514,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -13984,7 +14541,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -13994,12 +14550,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -14009,12 +14564,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -14025,14 +14579,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -14071,15 +14625,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -14090,10 +14662,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -14104,10 +14694,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -14116,17 +14724,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -14134,13 +14758,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -14153,34 +14776,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -14189,23 +14812,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -14224,8 +14847,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -14233,24 +14856,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -14260,14 +14883,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -14275,7 +14895,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -14300,18 +14920,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -14320,14 +14939,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -14344,12 +14963,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -14426,7 +15045,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -15010,11 +15629,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -15030,7 +15651,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -15055,7 +15676,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -15374,6 +15995,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -15432,6 +16063,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -15580,16 +16221,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -15613,22 +16254,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -15644,7 +16285,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -15671,22 +16334,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -15706,10 +16376,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -15736,7 +16406,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -15773,7 +16443,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -15789,9 +16459,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -17618,7 +18297,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -17739,17 +18418,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -17759,7 +18438,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -17784,7 +18463,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -17799,7 +18478,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -18143,8 +18822,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -18168,7 +18845,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -18220,7 +18897,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -18261,20 +18938,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -18334,19 +19011,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -19524,17 +20202,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -19544,7 +20222,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -19569,7 +20247,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -19585,7 +20263,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -19728,6 +20406,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -19821,6 +20508,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -19945,7 +20659,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -19956,7 +20670,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -19967,7 +20681,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -19978,7 +20692,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -19989,7 +20703,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -20082,6 +20796,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -20250,7 +20976,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -20258,7 +20984,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -20509,7 +21235,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -20543,11 +21269,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -20838,7 +21566,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -20967,11 +21706,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -21005,6 +21745,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -21072,7 +21837,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -21105,7 +21870,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -21226,7 +21991,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -22145,7 +22910,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -22382,7 +23147,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -22395,15 +23159,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -23532,8 +24293,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -23550,6 +24309,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -23566,7 +24326,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -23580,7 +24340,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -23652,9 +24411,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -23673,7 +24430,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -23751,8 +24508,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -23769,6 +24524,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -23785,7 +24541,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -23799,7 +24555,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -23871,9 +24626,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -23892,7 +24645,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -24015,8 +24768,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -24066,8 +24817,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -24249,7 +24998,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -24416,13 +25165,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -24463,6 +25210,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -24543,7 +25300,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -24670,49 +25427,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -24722,22 +25477,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -24745,7 +25510,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -24822,11 +25587,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -24854,10 +25620,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -24868,7 +25636,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -24978,7 +25746,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -24987,7 +25755,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -25097,9 +25865,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -25129,6 +25898,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -25371,7 +26142,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -25400,8 +26171,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -25428,7 +26216,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -25475,8 +26262,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -25571,7 +26361,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -25589,7 +26379,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -25652,8 +26442,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -25692,12 +26480,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -25756,7 +26549,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -25785,7 +26578,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -25797,7 +26590,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -25813,7 +26606,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -25852,14 +26645,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -25876,23 +26669,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -25913,6 +26689,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -25932,13 +26721,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -25980,8 +26772,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -26051,7 +26843,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -26108,15 +26900,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -26128,7 +26923,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -26321,7 +27116,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -26393,9 +27188,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -26439,24 +27234,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -26512,7 +27307,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -26546,17 +27341,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -26581,12 +27375,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -26934,14 +27728,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -26959,26 +27755,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -27303,6 +28079,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -27392,19 +28172,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -27453,6 +28240,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -27474,6 +28262,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -27483,36 +28272,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -27535,6 +28324,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -27556,6 +28346,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -27565,36 +28356,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -27617,6 +28408,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -27638,6 +28430,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -27647,36 +28440,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -27699,6 +28492,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -27720,6 +28514,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -27729,36 +28524,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -27772,7 +28567,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -27806,6 +28601,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -27816,6 +28612,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -27827,15 +28624,328 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
+NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_status_code_to_response = {
+    '200': _response_for_200,
+    '400': _response_for_400,
+}
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+        used_path = path.value
+
+        prefix_separator_iterator = None
+        for parameter in (
+            request_query_name,
+        ):
+            parameter_data = query_params.get(parameter.name, schemas.unset)
+            if parameter_data is schemas.unset:
+                continue
+            if prefix_separator_iterator is None:
+                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
+            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
+            for serialized_value in serialized_data.values():
+                used_path += serialized_value
+
+        _headers = HTTPHeaderDict()
+        # TODO add cookie handling
+        if accept_content_types:
+            for accept_content_type in accept_content_types:
+                _headers.add('Accept', accept_content_type)
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            headers=_headers,
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class SayHello(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+
+from test_my_api_python import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test_my_api_python import schemas  # noqa: F401
+
+from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
+from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
+
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -27892,28 +29002,55 @@ _response_for_400 = api_client.OpenApiResponse(
             schema=SchemaFor400ResponseBodyApplicationJson),
     },
 )
-_status_code_to_response = {
-    '200': _response_for_200,
-    '400': _response_for_400,
-}
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -27959,7 +29096,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -27967,40 +29108,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
+    ]: ...
 
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    def get(
-        self: BaseApi,
+    @typing.overload
+    def say_hello(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -28010,144 +29160,52 @@ class ApiForget(BaseApi):
         )
 
 
-",
-  "generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
-
-\\"\\"\\"
-
-
-    Generated by: https://openapi-generator.tech
-\\"\\"\\"
-
-from dataclasses import dataclass
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from test_my_api_python import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from test_my_api_python import schemas  # noqa: F401
-
-from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
-from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
-
-# query params
-NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
 
-    def _say_hello_oapg(
-        self: api_client.Api,
+    @typing.overload
+    def get(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_name,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+    ]: ...
 
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SayHello(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-    def say_hello(
-        self: BaseApi,
+    @typing.overload
+    def get(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -28306,6 +29364,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -28429,6 +29488,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -28463,17 +29523,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -28561,14 +29621,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -28576,15 +29649,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -28597,9 +29670,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -28608,17 +29689,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -28657,8 +29736,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -28667,21 +29808,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -28691,6 +29819,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -28735,16 +29871,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -28761,7 +29897,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -28849,12 +29985,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -28863,14 +29999,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -28887,7 +30023,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -28905,17 +30041,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -28948,35 +30100,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -28998,7 +30354,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -29010,147 +30366,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -29218,7 +30449,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -29228,7 +30459,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -29243,14 +30474,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -29272,9 +30503,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -29338,9 +30569,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -29371,7 +30602,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -29400,7 +30631,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -29408,7 +30639,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -29466,7 +30697,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -29483,7 +30714,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -29504,7 +30735,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -29514,7 +30745,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -29524,7 +30755,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -29534,7 +30765,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -29577,6 +30808,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -29586,6 +30818,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -29601,7 +30834,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -29611,7 +30844,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -29622,7 +30855,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -29710,7 +30943,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -29725,21 +30958,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -29838,9 +31074,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -29848,6 +31082,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -29864,7 +31099,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -29874,7 +31109,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -29911,7 +31146,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -29936,6 +31171,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -30034,18 +31270,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -30096,8 +31325,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -30112,12 +31342,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -30136,6 +31367,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -30147,9 +31379,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -30200,7 +31433,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -30237,8 +31472,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -30260,13 +31496,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -30287,7 +31523,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -30297,12 +31532,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -30312,12 +31546,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -30328,14 +31561,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -30374,15 +31607,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -30393,10 +31644,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -30407,10 +31676,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -30419,17 +31706,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -30437,13 +31740,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -30456,34 +31758,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -30492,23 +31794,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -30527,8 +31829,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -30536,24 +31838,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -30563,14 +31865,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -30578,7 +31877,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -30603,18 +31902,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -30623,14 +31921,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -30647,12 +31945,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -30734,7 +32032,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -31319,11 +32617,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -31339,7 +32639,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -31364,7 +32664,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -31683,6 +32983,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -31741,6 +33051,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -31889,16 +33209,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -31922,22 +33242,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -31953,7 +33273,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -31980,22 +33322,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -32015,10 +33364,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -32045,7 +33394,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -32082,7 +33431,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -32098,9 +33447,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -33914,7 +35272,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -34035,17 +35393,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -34055,7 +35413,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -34080,7 +35438,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -34095,7 +35453,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -34439,8 +35797,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -34464,7 +35820,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -34516,7 +35872,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -34557,20 +35913,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -34630,19 +35986,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -35820,17 +37177,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -35840,7 +37197,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -35865,7 +37222,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -35881,7 +37238,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -36024,6 +37381,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -36117,6 +37483,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -36241,7 +37634,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -36252,7 +37645,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -36263,7 +37656,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -36274,7 +37667,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -36285,7 +37678,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -36378,6 +37771,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -36546,7 +37951,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -36554,7 +37959,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -36805,7 +38210,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -36839,11 +38244,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -37134,7 +38541,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -37263,11 +38681,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -37301,6 +38720,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -37368,7 +38812,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -37401,7 +38845,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -37522,7 +38966,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -38441,7 +39885,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -38678,7 +40122,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -38691,15 +40134,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -39828,8 +41268,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -39846,6 +41284,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -39862,7 +41301,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -39876,7 +41315,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -39948,9 +41386,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -39969,7 +41405,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -40047,8 +41483,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -40065,6 +41499,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -40081,7 +41516,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -40095,7 +41530,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -40167,9 +41601,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -40188,7 +41620,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -40311,8 +41743,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -40362,8 +41792,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -40545,7 +41973,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -40712,13 +42140,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -40759,6 +42185,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -40839,7 +42275,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -40966,48 +42402,46 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
 
 ### Authorization
 
@@ -41018,22 +42452,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -41041,7 +42485,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -41118,11 +42562,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -41150,10 +42595,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -41164,7 +42611,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -41274,7 +42721,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -41283,7 +42730,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -41393,9 +42840,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -41425,6 +42873,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -41667,7 +43117,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -41696,8 +43146,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -41724,7 +43191,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -41771,8 +43237,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -41867,7 +43336,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -41885,7 +43354,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -41948,8 +43417,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -41988,12 +43455,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -42052,7 +43524,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -42081,7 +43553,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -42093,7 +43565,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -42109,7 +43581,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -42148,14 +43620,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -42172,23 +43644,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -42209,6 +43664,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -42228,13 +43696,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -42276,8 +43747,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -42347,7 +43818,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -42404,15 +43875,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -42424,7 +43898,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -42617,7 +44091,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -42689,9 +44163,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -42735,24 +44209,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -42808,7 +44282,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -42842,17 +44316,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -42877,12 +44350,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -43230,14 +44703,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -43255,26 +44730,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -43599,6 +45054,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -43688,19 +45147,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -43749,6 +45215,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43770,6 +45237,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -43779,36 +45247,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -43831,6 +45299,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43852,6 +45321,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -43861,36 +45331,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -43913,6 +45383,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43934,6 +45405,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -43943,36 +45415,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -43995,6 +45467,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44016,6 +45489,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -44025,36 +45499,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -44068,7 +45542,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -44102,6 +45576,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -44112,6 +45587,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44123,15 +45599,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -44198,18 +45674,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -44255,7 +45762,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -44263,17 +45774,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -44286,17 +45829,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -44316,6 +45891,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -44326,6 +45902,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44335,28 +45912,120 @@ from test_my_api_python import schemas  # noqa: F401
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
 SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -44402,7 +46071,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -44410,17 +46083,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -44433,17 +46138,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -44602,6 +46339,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -44725,6 +46463,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -44759,17 +46498,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -44857,14 +46596,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -44872,15 +46624,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -44893,9 +46645,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -44904,17 +46664,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -44953,8 +46711,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -44963,21 +46783,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -44987,6 +46794,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -45031,16 +46846,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -45057,7 +46872,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -45145,12 +46960,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -45159,14 +46974,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -45183,7 +46998,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -45201,17 +47016,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -45244,35 +47075,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -45294,7 +47329,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -45306,147 +47341,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -45514,7 +47424,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -45524,7 +47434,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -45539,14 +47449,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -45568,9 +47478,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -45634,9 +47544,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -45667,7 +47577,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -45696,7 +47606,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -45704,7 +47614,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -45762,7 +47672,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -45779,7 +47689,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -45800,7 +47710,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -45810,7 +47720,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -45820,7 +47730,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -45830,7 +47740,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -45873,6 +47783,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -45882,6 +47793,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -45897,7 +47809,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -45907,7 +47819,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -45918,7 +47830,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -46006,7 +47918,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -46021,21 +47933,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -46134,9 +48049,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -46144,6 +48057,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -46160,7 +48074,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -46170,7 +48084,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -46207,7 +48121,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -46232,6 +48146,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -46330,18 +48245,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -46392,8 +48300,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -46408,12 +48317,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -46432,6 +48342,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -46443,9 +48354,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -46496,7 +48408,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -46533,8 +48447,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -46556,13 +48471,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -46583,7 +48498,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -46593,12 +48507,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -46608,12 +48521,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -46624,14 +48536,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -46670,15 +48582,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -46689,10 +48619,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -46703,10 +48651,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -46715,17 +48681,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -46733,13 +48715,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -46752,34 +48733,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -46788,23 +48769,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -46823,8 +48804,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -46832,24 +48813,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -46859,14 +48840,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -46874,7 +48852,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -46899,18 +48877,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -46919,14 +48896,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -46943,12 +48920,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -47025,7 +49002,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -47609,11 +49586,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -47629,7 +49608,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -47654,7 +49633,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -47973,6 +49952,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -48031,6 +50020,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -48179,16 +50178,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -48212,22 +50211,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -48243,7 +50242,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -48270,22 +50291,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -48305,10 +50333,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -48335,7 +50363,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -48372,7 +50400,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -48388,9 +50416,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -50204,7 +52241,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -50325,17 +52362,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -50345,7 +52382,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -50370,7 +52407,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -50385,7 +52422,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -50729,8 +52766,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -50754,7 +52789,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -50806,7 +52841,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -50847,20 +52882,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -50920,19 +52955,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -52110,17 +54146,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -52130,7 +54166,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -52155,7 +54191,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -52171,7 +54207,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -52314,6 +54350,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -52407,6 +54452,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -52531,7 +54603,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -52542,7 +54614,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -52553,7 +54625,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -52564,7 +54636,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -52575,7 +54647,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -52668,6 +54740,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -52836,7 +54920,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -52844,7 +54928,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -53095,7 +55179,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -53129,11 +55213,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -53424,7 +55510,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -53553,11 +55650,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -53591,6 +55689,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -53658,7 +55781,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -53691,7 +55814,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -53812,7 +55935,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -54731,7 +56854,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -54968,7 +57091,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -54981,15 +57103,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -56118,8 +58237,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -56136,6 +58253,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -56152,7 +58270,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -56166,7 +58284,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -56238,9 +58355,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -56259,7 +58374,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -56337,8 +58452,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -56355,6 +58468,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -56371,7 +58485,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -56385,7 +58499,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -56457,9 +58570,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -56478,7 +58589,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -56601,8 +58712,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -56652,8 +58761,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -56835,7 +58942,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -57002,13 +59109,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -57049,6 +59154,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -57129,7 +59244,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -57256,49 +59371,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | Successful response
-400 | ApiResponseFor400 | Error response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | Successful response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | Error response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -57308,22 +59421,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -57331,7 +59454,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -57408,11 +59531,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -57440,10 +59564,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -57454,7 +59580,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Example API\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -57564,7 +59690,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -57573,7 +59699,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -57683,9 +59809,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -57715,6 +59842,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -57957,7 +60086,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -57986,8 +60115,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -58014,7 +60160,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -58061,8 +60206,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -58157,7 +60305,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -58175,7 +60323,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -58238,8 +60386,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -58278,12 +60424,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -58342,7 +60493,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -58371,7 +60522,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -58383,7 +60534,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -58399,7 +60550,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -58438,14 +60589,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -58462,23 +60613,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -58499,6 +60633,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -58518,13 +60665,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -58566,8 +60716,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -58637,7 +60787,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -58694,15 +60844,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -58714,7 +60867,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -58907,7 +61060,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -58979,9 +61132,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -59025,24 +61178,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -59098,7 +61251,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -59132,17 +61285,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -59167,12 +61319,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -59520,14 +61672,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -59545,26 +61699,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -59889,6 +62023,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -59978,19 +62116,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -60039,6 +62184,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -60060,6 +62206,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -60069,36 +62216,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -60121,6 +62268,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -60142,6 +62290,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -60151,36 +62300,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -60203,6 +62352,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -60224,6 +62374,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -60233,36 +62384,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -60285,6 +62436,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -60306,6 +62458,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -60315,36 +62468,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -60358,7 +62511,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -60392,6 +62545,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -60402,6 +62556,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -60413,15 +62568,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -60488,18 +62643,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -60545,7 +62731,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -60553,17 +62743,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -60576,17 +62798,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -60606,6 +62860,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -60616,6 +62871,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -60625,28 +62881,120 @@ from test_my_api_python import schemas  # noqa: F401
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
 SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -60692,7 +63040,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -60700,17 +63052,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -60723,17 +63107,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -60892,6 +63308,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -61015,6 +63432,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -61049,17 +63467,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -61147,14 +63565,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -61162,15 +63593,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -61183,9 +63614,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -61194,17 +63633,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -61243,8 +63680,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -61253,21 +63752,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -61277,6 +63763,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -61321,16 +63815,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -61347,7 +63841,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -61435,12 +63929,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -61449,14 +63943,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -61473,7 +63967,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -61491,17 +63985,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -61534,35 +64044,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -61584,7 +64298,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -61596,147 +64310,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -61804,7 +64393,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -61814,7 +64403,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -61829,14 +64418,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -61858,9 +64447,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -61924,9 +64513,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -61957,7 +64546,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -61986,7 +64575,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -61994,7 +64583,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -62052,7 +64641,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -62069,7 +64658,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -62090,7 +64679,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -62100,7 +64689,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -62110,7 +64699,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -62120,7 +64709,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -62163,6 +64752,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -62172,6 +64762,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -62187,7 +64778,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -62197,7 +64788,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -62208,7 +64799,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -62296,7 +64887,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -62311,21 +64902,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -62424,9 +65018,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -62434,6 +65026,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -62450,7 +65043,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -62460,7 +65053,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -62497,7 +65090,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -62522,6 +65115,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -62620,18 +65214,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -62682,8 +65269,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -62698,12 +65286,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -62722,6 +65311,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -62733,9 +65323,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -62786,7 +65377,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -62823,8 +65416,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -62846,13 +65440,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -62873,7 +65467,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -62883,12 +65476,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -62898,12 +65490,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -62914,14 +65505,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -62960,15 +65551,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -62979,10 +65588,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -62993,10 +65620,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -63005,17 +65650,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -63023,13 +65684,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -63042,34 +65702,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -63078,23 +65738,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -63113,8 +65773,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -63122,24 +65782,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -63149,14 +65809,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -63164,7 +65821,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -63189,18 +65846,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -63209,14 +65865,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -63233,12 +65889,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -63315,7 +65971,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -63899,11 +66555,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -63919,7 +66577,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -63944,7 +66602,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -64263,6 +66921,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -64321,6 +66989,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -64469,16 +67147,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -64502,22 +67180,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -64533,7 +67211,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -64560,22 +67260,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -64595,10 +67302,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -64625,7 +67332,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -64662,7 +67369,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -64678,9 +67385,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/with-docs.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/with-docs.test.ts.snap
index e07a31ba4..992f5c0f9 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/with-docs.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/with-docs.test.ts.snap
@@ -1241,7 +1241,7 @@ Like other \`projen\` managed files, this directory should be checked in to sour
   "generated/documentation/html2/.openapi-generator/FILES": ".openapi-generator-ignore
 index.html
 ",
-  "generated/documentation/html2/.openapi-generator/VERSION": "6.0.0",
+  "generated/documentation/html2/.openapi-generator/VERSION": "6.3.0",
   "generated/documentation/html2/index.html": "<!DOCTYPE html>
 <html>
 <head>
@@ -2449,22 +2449,18 @@ pub fn main() {
                                   <div id=\\"responses-Default-sayHello-schema-200\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Successful response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/SayHelloResponseContent\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -2515,22 +2511,18 @@ pub fn main() {
                                   <div id=\\"responses-Default-sayHello-schema-400\\" class=\\"exampleStyle\\">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  \\"description\\" : \\"Error response\\",
-  \\"content\\" : {
-    \\"application/json\\" : {
-      \\"schema\\" : {
-        \\"$ref\\" : \\"#/components/schemas/ApiErrorResponseContent\\"
-      }
-    }
-  }
-};
+                                        var schemaWrapper = ;
                                         var schema = findNode('schema',schemaWrapper).schema;
                                         if (!schema) {
                                           schema = schemaWrapper.schema;
                                         }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
+                                          Object.keys(schema.properties).forEach( (item) => {
+                                            if (schema.properties[item].$ref != null) {
+                                              schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
+                                            }
+                                          });
                                         } else if (schema.items != null && schema.items.$ref != null) {
                                             schema.items = defsParser.$refs.get(schema.items.$ref);
                                         } else {
@@ -4340,7 +4332,7 @@ Models/ApiErrorResponseContent.md
 Models/SayHelloResponseContent.md
 README.md
 ",
-  "generated/documentation/markdown/.openapi-generator/VERSION": "6.0.0",
+  "generated/documentation/markdown/.openapi-generator/VERSION": "6.3.0",
   "generated/documentation/markdown/Apis/DefaultApi.md": "# DefaultApi
 
 All URIs are relative to *http://localhost*
@@ -4447,7 +4439,7 @@ All endpoints do not require authorization.
   "generated/documentation/plantuml/.openapi-generator/FILES": ".openapi-generator-ignore
 schemas.plantuml
 ",
-  "generated/documentation/plantuml/.openapi-generator/VERSION": "6.0.0",
+  "generated/documentation/plantuml/.openapi-generator/VERSION": "6.3.0",
   "generated/documentation/plantuml/schemas.plantuml": "@startuml
 
 title Example API Schemas Diagram
@@ -4533,7 +4525,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -5117,11 +5109,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -5137,7 +5131,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -5162,7 +5156,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -5481,6 +5475,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -5539,6 +5543,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -5687,16 +5701,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -5720,22 +5734,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -5751,7 +5765,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -5778,22 +5814,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -5813,10 +5856,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -5843,7 +5886,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -5880,7 +5923,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -5896,9 +5939,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/without-sample-code.test.ts.snap b/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/without-sample-code.test.ts.snap
index a65bc432d..bf3d856bb 100644
--- a/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/without-sample-code.test.ts.snap
+++ b/packages/open-api-gateway/test/project/open-api-gateway-ts-project/__snapshots__/without-sample-code.test.ts.snap
@@ -1280,7 +1280,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -1864,11 +1864,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -1884,7 +1886,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -1909,7 +1911,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -2228,6 +2230,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -2286,6 +2298,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -2434,16 +2456,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -2467,22 +2489,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -2498,7 +2520,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -2525,22 +2569,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -2560,10 +2611,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -2590,7 +2641,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -2627,7 +2678,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -2643,9 +2694,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/smithy-api-gateway-java-project/__snapshots__/standalone.test.ts.snap b/packages/open-api-gateway/test/project/smithy-api-gateway-java-project/__snapshots__/standalone.test.ts.snap
index 4e6847f4a..77e04d8e7 100644
--- a/packages/open-api-gateway/test/project/smithy-api-gateway-java-project/__snapshots__/standalone.test.ts.snap
+++ b/packages/open-api-gateway/test/project/smithy-api-gateway-java-project/__snapshots__/standalone.test.ts.snap
@@ -493,7 +493,7 @@ src/test/java/com/generated/api/testjava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testjava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testjava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -614,17 +614,17 @@ src/test/java/com/generated/api/testjava/client/model/SayHelloResponseContentTes
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -634,7 +634,7 @@ src/test/java/com/generated/api/testjava/client/model/SayHelloResponseContentTes
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -659,7 +659,7 @@ src/test/java/com/generated/api/testjava/client/model/SayHelloResponseContentTes
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -674,7 +674,7 @@ src/test/java/com/generated/api/testjava/client/model/SayHelloResponseContentTes
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -1019,8 +1019,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -1044,7 +1042,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -1096,7 +1094,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -1137,20 +1135,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -1210,19 +1208,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -2400,17 +2399,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -2420,7 +2419,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -2445,7 +2444,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -2461,7 +2460,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -2604,6 +2603,15 @@ import com.generated.api.testjava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -2697,6 +2705,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -2821,7 +2856,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testjava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -2832,7 +2867,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testjava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -2843,7 +2878,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testjava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -2854,7 +2889,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testjava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -2865,7 +2900,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testjava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -2958,6 +2993,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -3126,7 +3173,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -3134,7 +3181,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -3385,7 +3432,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -3419,11 +3466,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -3714,7 +3763,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -3843,11 +3903,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -3881,6 +3942,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -3948,7 +4034,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -3981,7 +4067,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testjava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -4102,7 +4188,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -5021,7 +5107,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -5258,7 +5344,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -5271,15 +5356,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -6408,8 +6490,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -6426,6 +6506,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -6442,7 +6523,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -6456,7 +6537,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -6528,9 +6608,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -6549,7 +6627,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -6627,8 +6705,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -6645,6 +6721,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -6661,7 +6738,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -6675,7 +6752,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -6747,9 +6823,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -6768,7 +6842,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -6891,8 +6965,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -6942,8 +7014,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/packages/open-api-gateway/test/project/smithy-api-gateway-python-project/__snapshots__/standalone.test.ts.snap b/packages/open-api-gateway/test/project/smithy-api-gateway-python-project/__snapshots__/standalone.test.ts.snap
index 66107ce2b..36f540992 100644
--- a/packages/open-api-gateway/test/project/smithy-api-gateway-python-project/__snapshots__/standalone.test.ts.snap
+++ b/packages/open-api-gateway/test/project/smithy-api-gateway-python-project/__snapshots__/standalone.test.ts.snap
@@ -511,7 +511,7 @@ test_python/rest.py
 test_python/schemas.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -684,13 +684,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -731,6 +729,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -811,7 +819,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_python
 from pprint import pprint
-from test_python.apis import default_api
+from test_python.apis.tags import default_api
 from test_python.model.api_error_response_content import ApiErrorResponseContent
 from test_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -938,49 +946,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | SayHello 200 response
-400 | ApiResponseFor400 | ApiError 400 response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | SayHello 200 response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | ApiError 400 response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -990,22 +996,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# test_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# test_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -1013,7 +1029,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -1090,11 +1106,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -1122,10 +1139,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -1136,7 +1155,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Hello\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -1246,7 +1265,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -1255,7 +1274,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -1365,9 +1384,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -1397,6 +1417,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -1639,7 +1661,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -1668,8 +1690,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -1696,7 +1735,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -1743,8 +1781,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -1839,7 +1880,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -1857,7 +1898,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -1920,8 +1961,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -1960,12 +1999,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -2024,7 +2068,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -2053,7 +2097,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -2065,7 +2109,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -2081,7 +2125,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -2120,14 +2164,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -2144,23 +2188,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -2181,6 +2208,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -2200,13 +2240,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -2248,8 +2291,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -2319,7 +2362,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -2376,15 +2419,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -2396,7 +2442,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -2589,7 +2635,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -2661,9 +2707,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -2707,24 +2753,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -2780,7 +2826,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -2814,17 +2860,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/test_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/test_python/apis/path_to_api.py": "import typing
+  "generated/python/test_python/apis/path_to_api.py": "import typing_extensions
 
 from test_python.paths import PathValues
 from test_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -2849,12 +2894,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/test_python/apis/tag_to_api.py": "import typing
+  "generated/python/test_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_python.apis.tags import TagValues
 from test_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -3202,14 +3247,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -3227,26 +3274,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -3571,6 +3598,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -3660,19 +3691,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -3721,6 +3759,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3742,6 +3781,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -3751,36 +3791,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -3803,6 +3843,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3824,6 +3865,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -3833,36 +3875,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -3885,6 +3927,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3906,6 +3949,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -3915,36 +3959,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -3967,6 +4011,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -3988,6 +4033,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -3997,36 +4043,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -4040,7 +4086,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_python.model.pet import Pet
+# from test_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -4074,6 +4120,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -4084,6 +4131,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -4095,15 +4143,15 @@ from test_python.model.api_error_response_content import ApiErrorResponseContent
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -4170,18 +4218,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -4227,7 +4306,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -4235,17 +4318,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -4258,17 +4373,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -4288,6 +4435,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -4298,6 +4446,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -4307,47 +4456,139 @@ from test_python import schemas  # noqa: F401
 from test_python.model.say_hello_response_content import SayHelloResponseContent
 from test_python.model.api_error_response_content import ApiErrorResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
 SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
-
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
+    ]: ...
 
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_name,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+        used_path = path.value
+
+        prefix_separator_iterator = None
+        for parameter in (
+            request_query_name,
+        ):
+            parameter_data = query_params.get(parameter.name, schemas.unset)
+            if parameter_data is schemas.unset:
+                continue
+            if prefix_separator_iterator is None:
+                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
+            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
+            for serialized_value in serialized_data.values():
                 used_path += serialized_value
 
         _headers = HTTPHeaderDict()
@@ -4374,7 +4615,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -4382,17 +4627,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -4405,17 +4682,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -4574,6 +4883,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -4697,6 +5007,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -4731,17 +5042,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -4829,14 +5140,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -4844,15 +5168,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -4865,9 +5189,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -4876,17 +5208,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -4925,8 +5255,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -4935,21 +5327,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -4959,6 +5338,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -5003,16 +5390,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -5029,7 +5416,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -5117,12 +5504,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -5131,14 +5518,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -5155,7 +5542,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -5173,17 +5560,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -5216,35 +5619,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -5266,7 +5873,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -5278,147 +5885,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -5486,7 +5968,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -5496,7 +5978,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -5511,14 +5993,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -5540,9 +6022,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -5606,9 +6088,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -5639,7 +6121,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -5668,7 +6150,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -5676,7 +6158,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -5734,7 +6216,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -5751,7 +6233,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -5772,7 +6254,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -5782,7 +6264,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -5792,7 +6274,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -5802,7 +6284,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -5845,6 +6327,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -5854,6 +6337,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -5869,7 +6353,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -5879,7 +6363,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -5890,7 +6374,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -5978,7 +6462,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -5993,21 +6477,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -6106,9 +6593,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -6116,6 +6601,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -6132,7 +6618,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -6142,7 +6628,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -6179,7 +6665,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -6204,6 +6690,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -6302,18 +6789,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -6364,8 +6844,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -6380,12 +6861,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -6404,6 +6886,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -6415,9 +6898,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -6468,7 +6952,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -6505,8 +6991,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -6528,13 +7015,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -6555,7 +7042,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -6565,12 +7051,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -6580,12 +7065,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -6596,14 +7080,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -6642,15 +7126,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -6661,10 +7163,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -6675,10 +7195,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -6687,17 +7225,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -6705,13 +7259,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -6724,34 +7277,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -6760,23 +7313,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -6795,8 +7348,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -6804,24 +7357,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -6831,14 +7384,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -6846,7 +7396,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -6871,18 +7421,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -6891,14 +7440,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -6915,12 +7464,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
diff --git a/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/monorepo.test.ts.snap b/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/monorepo.test.ts.snap
index 8240adfcd..38a8bcf98 100644
--- a/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/monorepo.test.ts.snap
+++ b/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/monorepo.test.ts.snap
@@ -1847,7 +1847,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "packages/api/generated/java/.openapi-generator/VERSION": "6.0.1",
+  "packages/api/generated/java/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -1968,17 +1968,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -1988,7 +1988,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -2013,7 +2013,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -2028,7 +2028,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -2365,8 +2365,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -2390,7 +2388,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -2442,7 +2440,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -2483,20 +2481,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -2556,19 +2554,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -3746,17 +3745,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -3766,7 +3765,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -3791,7 +3790,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -3807,7 +3806,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -3950,6 +3949,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -4043,6 +4051,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -4167,7 +4202,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -4178,7 +4213,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -4189,7 +4224,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -4200,7 +4235,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -4211,7 +4246,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -4304,6 +4339,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -4472,7 +4519,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -4480,7 +4527,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -4731,7 +4778,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -4765,11 +4812,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -5060,7 +5109,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -5189,11 +5249,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -5227,6 +5288,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -5294,7 +5380,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -5327,7 +5413,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -5448,7 +5534,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -6367,7 +6453,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -6604,7 +6690,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -6617,15 +6702,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -7754,8 +7836,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7772,6 +7852,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7788,7 +7869,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -7802,7 +7883,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -7874,9 +7954,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -7895,7 +7973,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -7973,8 +8051,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7991,6 +8067,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -8007,7 +8084,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -8021,7 +8098,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -8093,9 +8169,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -8114,7 +8188,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -8237,8 +8311,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -8288,8 +8360,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -8471,7 +8541,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "packages/api/generated/python/.openapi-generator/VERSION": "6.1.0",
+  "packages/api/generated/python/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -8636,13 +8706,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -8683,6 +8751,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -8763,7 +8841,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -8890,49 +8968,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | SayHello 200 response
-400 | ApiResponseFor400 | ApiError 400 response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | SayHello 200 response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | ApiError 400 response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -8942,22 +9018,32 @@ No authorization required
 ",
   "packages/api/generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "packages/api/generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -8965,7 +9051,7 @@ Name | Type | Description | Notes
   "packages/api/generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -9043,11 +9129,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "packages/api/generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "packages/api/generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "packages/api/generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "packages/api/generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -9075,10 +9162,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -9089,7 +9178,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Hello\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -9199,7 +9288,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -9208,7 +9297,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -9318,9 +9407,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -9350,6 +9440,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -9592,7 +9684,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -9621,8 +9713,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -9649,7 +9758,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -9696,8 +9804,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -9792,7 +9903,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9810,7 +9921,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -9873,8 +9984,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -9913,12 +10022,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -9977,7 +10091,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -10006,7 +10120,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -10018,7 +10132,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -10034,7 +10148,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -10073,14 +10187,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -10097,23 +10211,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -10134,6 +10231,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -10153,13 +10263,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -10201,8 +10314,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -10272,7 +10385,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -10329,15 +10442,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -10349,7 +10465,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -10542,7 +10658,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -10614,9 +10730,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -10660,24 +10776,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -10733,7 +10849,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -10767,17 +10883,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "packages/api/generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -10802,12 +10917,12 @@ class Hello(
 ):
     pass
 ",
-  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -11155,14 +11270,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -11180,26 +11297,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -11524,6 +11621,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -11613,19 +11714,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -11674,6 +11782,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11695,6 +11804,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11704,36 +11814,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11756,6 +11866,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11777,6 +11888,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11786,36 +11898,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11838,6 +11950,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11859,6 +11972,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11868,36 +11982,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11920,6 +12034,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11941,6 +12056,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11950,36 +12066,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11993,7 +12109,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -12027,6 +12143,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -12037,6 +12154,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -12048,15 +12166,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -12123,165 +12241,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
-
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_name,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
+    ]: ...
 
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SayHello(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    def say_hello(
-        self: BaseApi,
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    def get(
-        self: BaseApi,
+    @typing.overload
+    def _say_hello_oapg(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-",
-  "packages/api/generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
-
-\\"\\"\\"
-
-
-    Generated by: https://openapi-generator.tech
-\\"\\"\\"
-
-from dataclasses import dataclass
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from test_my_api_python import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from test_my_api_python import schemas  # noqa: F401
-
-from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
-from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
-
-# query params
-NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -12327,7 +12329,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -12335,17 +12341,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -12358,17 +12396,358 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
     def get(
-        self: BaseApi,
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "packages/api/generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+
+from test_my_api_python import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test_my_api_python import schemas  # noqa: F401
+
+from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
+from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
+
+# Query params
+NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+        used_path = path.value
+
+        prefix_separator_iterator = None
+        for parameter in (
+            request_query_name,
+        ):
+            parameter_data = query_params.get(parameter.name, schemas.unset)
+            if parameter_data is schemas.unset:
+                continue
+            if prefix_separator_iterator is None:
+                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
+            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
+            for serialized_value in serialized_data.values():
+                used_path += serialized_value
+
+        _headers = HTTPHeaderDict()
+        # TODO add cookie handling
+        if accept_content_types:
+            for accept_content_type in accept_content_types:
+                _headers.add('Accept', accept_content_type)
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            headers=_headers,
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class SayHello(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -12527,6 +12906,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -12650,6 +13030,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -12684,17 +13065,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -12782,14 +13163,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -12797,15 +13191,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -12818,9 +13212,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -12829,17 +13231,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -12878,8 +13278,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -12888,21 +13350,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -12912,6 +13361,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -12956,16 +13413,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -12982,7 +13439,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -13070,12 +13527,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -13084,14 +13541,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -13108,7 +13565,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -13126,17 +13583,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -13169,35 +13642,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -13219,7 +13896,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -13231,147 +13908,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -13439,7 +13991,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -13449,7 +14001,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -13464,14 +14016,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -13493,9 +14045,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -13559,9 +14111,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -13592,7 +14144,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -13621,7 +14173,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -13629,7 +14181,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -13687,7 +14239,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -13704,7 +14256,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -13725,7 +14277,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13735,7 +14287,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -13745,7 +14297,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13755,7 +14307,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -13798,6 +14350,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -13807,6 +14360,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -13822,7 +14376,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -13832,7 +14386,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -13843,7 +14397,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -13931,7 +14485,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -13946,21 +14500,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -14059,9 +14616,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -14069,6 +14624,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -14085,7 +14641,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -14095,7 +14651,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -14132,7 +14688,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -14157,6 +14713,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -14255,18 +14812,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -14317,8 +14867,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -14333,12 +14884,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -14357,6 +14909,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -14368,9 +14921,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -14421,7 +14975,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -14458,8 +15014,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -14481,13 +15038,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -14508,7 +15065,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -14518,12 +15074,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -14533,12 +15088,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -14549,14 +15103,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -14595,15 +15149,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -14614,10 +15186,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -14628,10 +15218,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -14640,17 +15248,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -14658,13 +15282,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -14677,34 +15300,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -14713,23 +15336,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -14748,8 +15371,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -14757,24 +15380,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -14784,14 +15407,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -14799,7 +15419,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -14824,18 +15444,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -14844,14 +15463,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -14868,12 +15487,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "packages/api/generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -14950,7 +15569,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -15534,11 +16153,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -15554,7 +16175,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -15579,7 +16200,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -15898,6 +16519,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -15956,6 +16587,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -16104,16 +16745,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -16137,22 +16778,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -16168,7 +16809,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -16195,22 +16858,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -16230,10 +16900,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -16260,7 +16930,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -16297,7 +16967,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -16313,9 +16983,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -20153,7 +20832,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "packages/api/generated/java/.openapi-generator/VERSION": "6.0.1",
+  "packages/api/generated/java/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -20274,17 +20953,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -20294,7 +20973,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -20319,7 +20998,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -20334,7 +21013,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -20671,8 +21350,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -20696,7 +21373,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -20748,7 +21425,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -20789,20 +21466,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -20862,19 +21539,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -22052,17 +22730,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -22072,7 +22750,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -22097,7 +22775,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -22113,7 +22791,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -22256,6 +22934,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -22349,6 +23036,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -22473,7 +23187,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -22484,7 +23198,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -22495,7 +23209,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -22506,7 +23220,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -22517,7 +23231,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -22610,6 +23324,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -22778,7 +23504,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -22786,7 +23512,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -23037,7 +23763,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -23071,11 +23797,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -23366,7 +24094,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -23495,11 +24234,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -23533,6 +24273,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -23600,7 +24365,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -23633,7 +24398,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -23754,7 +24519,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -24673,7 +25438,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -24910,7 +25675,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -24923,15 +25687,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -26060,8 +26821,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -26078,6 +26837,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -26094,7 +26854,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -26108,7 +26868,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -26180,9 +26939,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -26201,7 +26958,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -26279,8 +27036,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -26297,6 +27052,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -26313,7 +27069,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -26327,7 +27083,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -26399,9 +27154,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -26420,7 +27173,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -26543,8 +27296,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -26594,8 +27345,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -26777,7 +27526,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "packages/api/generated/python/.openapi-generator/VERSION": "6.1.0",
+  "packages/api/generated/python/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -26942,13 +27691,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -26989,6 +27736,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -27069,7 +27826,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -27196,49 +27953,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | SayHello 200 response
-400 | ApiResponseFor400 | ApiError 400 response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | SayHello 200 response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | ApiError 400 response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -27248,22 +28003,32 @@ No authorization required
 ",
   "packages/api/generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "packages/api/generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -27271,7 +28036,7 @@ Name | Type | Description | Notes
   "packages/api/generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -27349,11 +28114,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "packages/api/generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "packages/api/generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "packages/api/generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "packages/api/generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -27381,10 +28147,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -27395,7 +28163,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Hello\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -27505,7 +28273,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -27514,7 +28282,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -27624,9 +28392,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -27656,6 +28425,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -27898,7 +28669,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -27927,8 +28698,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -27955,7 +28743,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -28002,8 +28789,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -28098,7 +28888,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -28116,7 +28906,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -28179,8 +28969,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -28219,12 +29007,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -28283,7 +29076,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -28312,7 +29105,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -28324,7 +29117,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -28340,7 +29133,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -28379,14 +29172,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -28403,23 +29196,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -28440,6 +29216,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -28459,13 +29248,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -28507,8 +29299,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -28578,7 +29370,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -28635,15 +29427,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -28655,7 +29450,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -28848,7 +29643,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -28920,9 +29715,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -28966,24 +29761,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -29039,7 +29834,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -29073,17 +29868,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "packages/api/generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -29108,12 +29902,12 @@ class Hello(
 ):
     pass
 ",
-  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -29461,14 +30255,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -29486,26 +30282,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -29830,6 +30606,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -29919,19 +30699,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -29980,6 +30767,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -30001,6 +30789,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -30010,36 +30799,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -30062,6 +30851,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -30083,6 +30873,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -30092,36 +30883,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -30144,6 +30935,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -30165,6 +30957,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -30174,36 +30967,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -30226,6 +31019,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -30247,6 +31041,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -30256,36 +31051,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -30299,7 +31094,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -30333,6 +31128,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -30343,6 +31139,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -30354,15 +31151,328 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
+NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_status_code_to_response = {
+    '200': _response_for_200,
+    '400': _response_for_400,
+}
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+        used_path = path.value
+
+        prefix_separator_iterator = None
+        for parameter in (
+            request_query_name,
+        ):
+            parameter_data = query_params.get(parameter.name, schemas.unset)
+            if parameter_data is schemas.unset:
+                continue
+            if prefix_separator_iterator is None:
+                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
+            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
+            for serialized_value in serialized_data.values():
+                used_path += serialized_value
+
+        _headers = HTTPHeaderDict()
+        # TODO add cookie handling
+        if accept_content_types:
+            for accept_content_type in accept_content_types:
+                _headers.add('Accept', accept_content_type)
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            headers=_headers,
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class SayHello(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "packages/api/generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+
+from test_my_api_python import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test_my_api_python import schemas  # noqa: F401
+
+from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
+from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
+
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -30419,28 +31529,55 @@ _response_for_400 = api_client.OpenApiResponse(
             schema=SchemaFor400ResponseBodyApplicationJson),
     },
 )
-_status_code_to_response = {
-    '200': _response_for_200,
-    '400': _response_for_400,
-}
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -30486,7 +31623,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -30494,40 +31635,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
+    ]: ...
 
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    def get(
-        self: BaseApi,
+    @typing.overload
+    def say_hello(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -30537,144 +31687,52 @@ class ApiForget(BaseApi):
         )
 
 
-",
-  "packages/api/generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
-
-\\"\\"\\"
-
-
-    Generated by: https://openapi-generator.tech
-\\"\\"\\"
-
-from dataclasses import dataclass
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from test_my_api_python import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from test_my_api_python import schemas  # noqa: F401
-
-from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
-from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
-
-# query params
-NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
 
-    def _say_hello_oapg(
-        self: api_client.Api,
+    @typing.overload
+    def get(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_name,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+    ]: ...
 
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SayHello(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-    def say_hello(
-        self: BaseApi,
+    @typing.overload
+    def get(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -30833,6 +31891,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -30956,6 +32015,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -30990,17 +32050,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -31088,14 +32148,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -31103,15 +32176,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -31124,9 +32197,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -31135,17 +32216,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -31184,8 +32263,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -31194,21 +32335,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -31218,6 +32346,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -31262,16 +32398,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -31288,7 +32424,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -31376,12 +32512,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -31390,14 +32526,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -31414,7 +32550,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -31432,17 +32568,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -31475,35 +32627,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -31525,7 +32881,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -31537,147 +32893,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -31745,7 +32976,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -31755,7 +32986,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -31770,14 +33001,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -31799,9 +33030,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -31865,9 +33096,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -31898,7 +33129,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -31927,7 +33158,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -31935,7 +33166,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -31993,7 +33224,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -32010,7 +33241,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -32031,7 +33262,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -32041,7 +33272,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -32051,7 +33282,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -32061,7 +33292,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -32104,6 +33335,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -32113,6 +33345,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -32128,7 +33361,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -32138,7 +33371,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -32149,7 +33382,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -32237,7 +33470,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -32252,21 +33485,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -32365,9 +33601,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -32375,6 +33609,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -32391,7 +33626,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -32401,7 +33636,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -32438,7 +33673,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -32463,6 +33698,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -32561,18 +33797,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -32623,8 +33852,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -32639,12 +33869,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -32663,6 +33894,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -32674,9 +33906,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -32727,7 +33960,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -32764,8 +33999,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -32787,13 +34023,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -32814,7 +34050,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -32824,12 +34059,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -32839,12 +34073,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -32855,14 +34088,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -32901,15 +34134,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -32920,10 +34171,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -32934,10 +34203,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -32946,17 +34233,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -32964,13 +34267,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -32983,34 +34285,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -33019,23 +34321,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -33054,8 +34356,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -33063,24 +34365,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -33090,14 +34392,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -33105,7 +34404,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -33130,18 +34429,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -33150,14 +34448,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -33174,12 +34472,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "packages/api/generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -33261,7 +34559,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -33846,11 +35144,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -33866,7 +35166,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -33891,7 +35191,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -34210,6 +35510,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -34268,6 +35578,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -34416,16 +35736,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -34449,22 +35769,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -34480,7 +35800,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -34507,22 +35849,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -34542,10 +35891,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -34572,7 +35921,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -34609,7 +35958,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -34625,9 +35974,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -38473,7 +39831,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "packages/api/generated/java/.openapi-generator/VERSION": "6.0.1",
+  "packages/api/generated/java/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -38594,17 +39952,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -38614,7 +39972,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -38639,7 +39997,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -38654,7 +40012,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -38991,8 +40349,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -39016,7 +40372,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -39068,7 +40424,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -39109,20 +40465,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -39182,19 +40538,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -40372,17 +41729,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -40392,7 +41749,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -40417,7 +41774,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -40433,7 +41790,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -40576,6 +41933,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -40669,6 +42035,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -40793,7 +42186,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -40804,7 +42197,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -40815,7 +42208,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -40826,7 +42219,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -40837,7 +42230,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -40930,6 +42323,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -41098,7 +42503,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -41106,7 +42511,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -41357,7 +42762,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -41391,11 +42796,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -41686,7 +43093,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -41815,11 +43233,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -41853,6 +43272,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -41920,7 +43364,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -41953,7 +43397,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -42074,7 +43518,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -42993,7 +44437,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -43230,7 +44674,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -43243,15 +44686,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -44380,8 +45820,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -44398,6 +45836,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -44414,7 +45853,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -44428,7 +45867,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -44500,9 +45938,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -44521,7 +45957,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -44599,8 +46035,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -44617,6 +46051,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -44633,7 +46068,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -44647,7 +46082,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -44719,9 +46153,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -44740,7 +46172,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -44863,8 +46295,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -44914,8 +46344,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -45097,7 +46525,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "packages/api/generated/python/.openapi-generator/VERSION": "6.1.0",
+  "packages/api/generated/python/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -45262,13 +46690,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -45309,6 +46735,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -45389,7 +46825,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -45516,48 +46952,46 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | SayHello 200 response
-400 | ApiResponseFor400 | ApiError 400 response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | SayHello 200 response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | ApiError 400 response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
 
 ### Authorization
 
@@ -45568,22 +47002,32 @@ No authorization required
 ",
   "packages/api/generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "packages/api/generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -45591,7 +47035,7 @@ Name | Type | Description | Notes
   "packages/api/generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -45669,11 +47113,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "packages/api/generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "packages/api/generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "packages/api/generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "packages/api/generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -45701,10 +47146,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -45715,7 +47162,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Hello\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -45825,7 +47272,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -45834,7 +47281,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -45944,9 +47391,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -45976,6 +47424,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -46218,7 +47668,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -46247,8 +47697,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -46275,7 +47742,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -46322,8 +47788,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -46418,7 +47887,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -46436,7 +47905,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -46499,8 +47968,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -46539,12 +48006,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -46603,7 +48075,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -46632,7 +48104,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -46644,7 +48116,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -46660,7 +48132,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -46699,14 +48171,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -46723,23 +48195,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -46760,6 +48215,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -46779,13 +48247,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -46827,8 +48298,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -46898,7 +48369,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -46955,15 +48426,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -46975,7 +48449,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -47168,7 +48642,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -47240,9 +48714,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -47286,24 +48760,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -47359,7 +48833,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -47393,17 +48867,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "packages/api/generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -47428,12 +48901,12 @@ class Hello(
 ):
     pass
 ",
-  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -47781,14 +49254,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -47806,26 +49281,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -48150,6 +49605,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -48239,19 +49698,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -48300,6 +49766,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -48321,6 +49788,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -48330,36 +49798,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -48382,6 +49850,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -48403,6 +49872,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -48412,36 +49882,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -48464,6 +49934,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -48485,6 +49956,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -48494,36 +49966,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -48546,6 +50018,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -48567,6 +50040,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -48576,36 +50050,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -48619,7 +50093,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -48653,6 +50127,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -48663,6 +50138,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -48674,15 +50150,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -48749,18 +50225,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -48806,7 +50313,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -48814,17 +50325,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -48837,17 +50380,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -48867,6 +50442,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -48877,6 +50453,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -48886,28 +50463,120 @@ from test_my_api_python import schemas  # noqa: F401
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
 SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -48953,7 +50622,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -48961,17 +50634,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -48984,17 +50689,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -49153,6 +50890,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -49276,6 +51014,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -49310,17 +51049,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -49408,14 +51147,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -49423,15 +51175,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -49444,9 +51196,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -49455,17 +51215,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -49504,8 +51262,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -49514,21 +51334,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -49538,6 +51345,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -49582,16 +51397,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -49608,7 +51423,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -49696,12 +51511,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -49710,14 +51525,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -49734,7 +51549,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -49752,17 +51567,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -49795,35 +51626,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -49845,7 +51880,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -49857,147 +51892,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -50065,7 +51975,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -50075,7 +51985,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -50090,14 +52000,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -50119,9 +52029,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -50185,9 +52095,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -50218,7 +52128,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -50247,7 +52157,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -50255,7 +52165,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -50313,7 +52223,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -50330,7 +52240,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -50351,7 +52261,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -50361,7 +52271,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -50371,7 +52281,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -50381,7 +52291,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -50424,6 +52334,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -50433,6 +52344,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -50448,7 +52360,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -50458,7 +52370,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -50469,7 +52381,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -50557,7 +52469,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -50572,21 +52484,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -50685,9 +52600,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -50695,6 +52608,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -50711,7 +52625,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -50721,7 +52635,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -50758,7 +52672,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -50783,6 +52697,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -50881,18 +52796,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -50943,8 +52851,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -50959,12 +52868,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -50983,6 +52893,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -50994,9 +52905,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -51047,7 +52959,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -51084,8 +52998,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -51107,13 +53022,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -51134,7 +53049,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -51144,12 +53058,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -51159,12 +53072,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -51175,14 +53087,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -51221,15 +53133,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -51240,10 +53170,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -51254,10 +53202,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -51266,17 +53232,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -51284,13 +53266,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -51303,34 +53284,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -51339,23 +53320,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -51374,8 +53355,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -51383,24 +53364,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -51410,14 +53391,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -51425,7 +53403,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -51450,18 +53428,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -51470,14 +53447,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -51494,12 +53471,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "packages/api/generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -51576,7 +53553,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -52160,11 +54137,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -52180,7 +54159,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -52205,7 +54184,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -52524,6 +54503,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -52582,6 +54571,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -52730,16 +54729,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -52763,22 +54762,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -52794,7 +54793,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -52821,22 +54842,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -52856,10 +54884,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -52886,7 +54914,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -52923,7 +54951,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -52939,9 +54967,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -56779,7 +58816,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "packages/api/generated/java/.openapi-generator/VERSION": "6.0.1",
+  "packages/api/generated/java/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -56900,17 +58937,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -56920,7 +58957,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -56945,7 +58982,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -56960,7 +58997,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -57297,8 +59334,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -57322,7 +59357,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -57374,7 +59409,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -57415,20 +59450,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -57488,19 +59523,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -58678,17 +60714,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -58698,7 +60734,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -58723,7 +60759,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -58739,7 +60775,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -58882,6 +60918,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -58975,6 +61020,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -59099,7 +61171,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -59110,7 +61182,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -59121,7 +61193,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -59132,7 +61204,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -59143,7 +61215,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -59236,6 +61308,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -59404,7 +61488,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -59412,7 +61496,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -59663,7 +61747,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -59697,11 +61781,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -59992,7 +62078,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -60121,11 +62218,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -60159,6 +62257,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -60226,7 +62349,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -60259,7 +62382,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -60380,7 +62503,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -61299,7 +63422,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -61536,7 +63659,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -61549,15 +63671,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -62686,8 +64805,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -62704,6 +64821,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -62720,7 +64838,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -62734,7 +64852,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -62806,9 +64923,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -62827,7 +64942,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -62905,8 +65020,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -62923,6 +65036,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -62939,7 +65053,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -62953,7 +65067,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -63025,9 +65138,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -63046,7 +65157,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -63169,8 +65280,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -63220,8 +65329,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -63403,7 +65510,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "packages/api/generated/python/.openapi-generator/VERSION": "6.1.0",
+  "packages/api/generated/python/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -63568,13 +65675,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -63615,6 +65720,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -63695,7 +65810,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -63822,49 +65937,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | SayHello 200 response
-400 | ApiResponseFor400 | ApiError 400 response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | SayHello 200 response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | ApiError 400 response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -63874,22 +65987,32 @@ No authorization required
 ",
   "packages/api/generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "packages/api/generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -63897,7 +66020,7 @@ Name | Type | Description | Notes
   "packages/api/generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -63975,11 +66098,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "packages/api/generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "packages/api/generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "packages/api/generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "packages/api/generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -64007,10 +66131,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -64021,7 +66147,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Hello\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -64131,7 +66257,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -64140,7 +66266,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -64250,9 +66376,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -64282,6 +66409,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -64524,7 +66653,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -64553,8 +66682,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -64581,7 +66727,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -64628,8 +66773,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -64724,7 +66872,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -64742,7 +66890,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -64805,8 +66953,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -64845,12 +66991,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -64909,7 +67060,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -64938,7 +67089,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -64950,7 +67101,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -64966,7 +67117,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -65005,14 +67156,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -65029,23 +67180,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -65066,6 +67200,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -65085,13 +67232,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -65133,8 +67283,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -65204,7 +67354,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -65261,15 +67411,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -65281,7 +67434,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -65474,7 +67627,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -65546,9 +67699,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -65592,24 +67745,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -65665,7 +67818,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -65699,17 +67852,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "packages/api/generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -65734,12 +67886,12 @@ class Hello(
 ):
     pass
 ",
-  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "packages/api/generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -66087,14 +68239,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -66112,26 +68266,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -66456,6 +68590,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -66545,19 +68683,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -66606,6 +68751,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -66627,6 +68773,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -66636,36 +68783,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -66688,6 +68835,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -66709,6 +68857,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -66718,36 +68867,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -66770,6 +68919,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -66791,6 +68941,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -66800,36 +68951,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -66852,6 +69003,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -66873,6 +69025,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -66882,36 +69035,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -66925,7 +69078,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -66959,6 +69112,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -66969,6 +69123,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -66980,15 +69135,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -67055,18 +69210,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -67112,7 +69298,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -67120,17 +69310,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -67143,17 +69365,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -67173,6 +69427,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -67183,6 +69438,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -67192,28 +69448,120 @@ from test_my_api_python import schemas  # noqa: F401
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
 SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -67259,7 +69607,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -67267,17 +69619,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -67290,17 +69674,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -67459,6 +69875,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -67582,6 +69999,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -67616,17 +70034,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -67714,14 +70132,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -67729,15 +70160,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -67750,9 +70181,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -67761,17 +70200,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -67810,8 +70247,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -67820,21 +70319,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -67844,6 +70330,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -67888,16 +70382,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -67914,7 +70408,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -68002,12 +70496,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -68016,14 +70510,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -68040,7 +70534,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -68058,17 +70552,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -68101,35 +70611,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -68151,7 +70865,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -68163,147 +70877,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -68371,7 +70960,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -68381,7 +70970,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -68396,14 +70985,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -68425,9 +71014,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -68491,9 +71080,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -68524,7 +71113,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -68553,7 +71142,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -68561,7 +71150,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -68619,7 +71208,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -68636,7 +71225,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -68657,7 +71246,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -68667,7 +71256,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -68677,7 +71266,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -68687,7 +71276,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -68730,6 +71319,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -68739,6 +71329,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -68754,7 +71345,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -68764,7 +71355,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -68775,7 +71366,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -68863,7 +71454,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -68878,21 +71469,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -68991,9 +71585,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -69001,6 +71593,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -69017,7 +71610,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -69027,7 +71620,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -69064,7 +71657,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -69089,6 +71682,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -69187,18 +71781,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -69249,8 +71836,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -69265,12 +71853,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -69289,6 +71878,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -69300,9 +71890,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -69353,7 +71944,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -69390,8 +71983,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -69413,13 +72007,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -69440,7 +72034,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -69450,12 +72043,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -69465,12 +72057,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -69481,14 +72072,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -69527,15 +72118,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -69546,10 +72155,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -69560,10 +72187,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -69572,17 +72217,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -69590,13 +72251,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -69609,34 +72269,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -69645,23 +72305,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -69680,8 +72340,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -69689,24 +72349,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -69716,14 +72376,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -69731,7 +72388,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -69756,18 +72413,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -69776,14 +72432,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -69800,12 +72456,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "packages/api/generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -69882,7 +72538,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -70466,11 +73122,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -70486,7 +73144,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -70511,7 +73169,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -70830,6 +73488,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -70888,6 +73556,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -71036,16 +73714,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -71069,22 +73747,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -71100,7 +73778,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -71127,22 +73827,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -71162,10 +73869,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -71192,7 +73899,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -71229,7 +73936,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -71245,9 +73952,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/standalone.test.ts.snap b/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/standalone.test.ts.snap
index a3c7c41d6..222cbf3ab 100644
--- a/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/standalone.test.ts.snap
+++ b/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/standalone.test.ts.snap
@@ -1323,7 +1323,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -1444,17 +1444,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -1464,7 +1464,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -1489,7 +1489,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -1504,7 +1504,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -1849,8 +1849,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -1874,7 +1872,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -1926,7 +1924,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -1967,20 +1965,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -2040,19 +2038,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -3230,17 +3229,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -3250,7 +3249,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -3275,7 +3274,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -3291,7 +3290,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -3434,6 +3433,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -3527,6 +3535,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -3651,7 +3686,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -3662,7 +3697,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -3673,7 +3708,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -3684,7 +3719,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -3695,7 +3730,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -3788,6 +3823,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -3956,7 +4003,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -3964,7 +4011,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -4215,7 +4262,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -4249,11 +4296,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -4544,7 +4593,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -4673,11 +4733,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -4711,6 +4772,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -4778,7 +4864,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -4811,7 +4897,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -4932,7 +5018,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -5851,7 +5937,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -6088,7 +6174,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -6101,15 +6186,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -7238,8 +7320,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7256,6 +7336,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7272,7 +7353,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -7286,7 +7367,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -7358,9 +7438,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -7379,7 +7457,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -7457,8 +7535,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -7475,6 +7551,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -7491,7 +7568,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -7505,7 +7582,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -7577,9 +7653,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -7598,7 +7672,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -7721,8 +7795,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7772,8 +7844,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -7955,7 +8025,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -8122,13 +8192,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -8169,6 +8237,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -8249,7 +8327,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -8376,49 +8454,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | SayHello 200 response
-400 | ApiResponseFor400 | ApiError 400 response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | SayHello 200 response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | ApiError 400 response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -8428,22 +8504,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -8451,7 +8537,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -8528,11 +8614,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -8560,10 +8647,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -8574,7 +8663,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Hello\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -8684,7 +8773,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -8693,7 +8782,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -8803,9 +8892,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -8835,6 +8925,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -9077,7 +9169,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -9106,8 +9198,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -9134,7 +9243,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -9181,8 +9289,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -9277,7 +9388,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9295,7 +9406,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -9358,8 +9469,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -9398,12 +9507,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -9462,7 +9576,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9491,7 +9605,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -9503,7 +9617,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -9519,7 +9633,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -9558,14 +9672,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -9582,23 +9696,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -9619,6 +9716,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -9638,13 +9748,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -9686,8 +9799,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -9757,7 +9870,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -9814,15 +9927,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -9834,7 +9950,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -10027,7 +10143,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -10099,9 +10215,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -10145,24 +10261,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -10218,7 +10334,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -10252,17 +10368,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -10287,12 +10402,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -10640,14 +10755,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -10665,26 +10782,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -11009,6 +11106,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -11098,19 +11199,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -11159,6 +11267,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11180,6 +11289,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11189,36 +11299,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11241,6 +11351,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11262,6 +11373,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -11271,36 +11383,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -11323,6 +11435,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11344,6 +11457,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11353,36 +11467,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11405,6 +11519,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11426,6 +11541,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -11435,36 +11551,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -11478,7 +11594,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -11512,6 +11628,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -11522,6 +11639,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -11533,15 +11651,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -11608,165 +11726,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
-
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_name,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
+    ]: ...
 
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SayHello(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    def say_hello(
-        self: BaseApi,
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    def get(
-        self: BaseApi,
+    @typing.overload
+    def _say_hello_oapg(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-",
-  "generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
-
-\\"\\"\\"
-
-
-    Generated by: https://openapi-generator.tech
-\\"\\"\\"
-
-from dataclasses import dataclass
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from test_my_api_python import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from test_my_api_python import schemas  # noqa: F401
-
-from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
-from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
-
-# query params
-NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -11812,7 +11814,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -11820,17 +11826,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -11843,17 +11881,358 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
     def get(
-        self: BaseApi,
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+
+from test_my_api_python import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test_my_api_python import schemas  # noqa: F401
+
+from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
+from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
+
+# Query params
+NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+        used_path = path.value
+
+        prefix_separator_iterator = None
+        for parameter in (
+            request_query_name,
+        ):
+            parameter_data = query_params.get(parameter.name, schemas.unset)
+            if parameter_data is schemas.unset:
+                continue
+            if prefix_separator_iterator is None:
+                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
+            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
+            for serialized_value in serialized_data.values():
+                used_path += serialized_value
+
+        _headers = HTTPHeaderDict()
+        # TODO add cookie handling
+        if accept_content_types:
+            for accept_content_type in accept_content_types:
+                _headers.add('Accept', accept_content_type)
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            headers=_headers,
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class SayHello(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -12012,6 +12391,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -12135,6 +12515,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -12169,17 +12550,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -12267,14 +12648,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -12282,15 +12676,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -12303,9 +12697,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -12314,17 +12716,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -12363,8 +12763,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -12373,21 +12835,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -12397,6 +12846,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -12441,16 +12898,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -12467,7 +12924,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -12555,12 +13012,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -12569,14 +13026,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -12593,7 +13050,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -12611,17 +13068,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -12654,35 +13127,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -12704,7 +13381,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -12716,147 +13393,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -12924,7 +13476,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -12934,7 +13486,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -12949,14 +13501,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -12978,9 +13530,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -13044,9 +13596,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -13077,7 +13629,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -13106,7 +13658,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -13114,7 +13666,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -13172,7 +13724,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -13189,7 +13741,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -13210,7 +13762,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13220,7 +13772,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -13230,7 +13782,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -13240,7 +13792,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -13283,6 +13835,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -13292,6 +13845,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -13307,7 +13861,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -13317,7 +13871,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -13328,7 +13882,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -13416,7 +13970,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -13431,21 +13985,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -13544,9 +14101,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -13554,6 +14109,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -13570,7 +14126,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -13580,7 +14136,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -13617,7 +14173,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -13642,6 +14198,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -13740,18 +14297,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -13802,8 +14352,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -13818,12 +14369,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -13842,6 +14394,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -13853,9 +14406,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -13906,7 +14460,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -13943,8 +14499,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -13966,13 +14523,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -13993,7 +14550,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -14003,12 +14559,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -14018,12 +14573,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -14034,14 +14588,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -14080,15 +14634,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -14099,10 +14671,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -14113,10 +14703,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -14125,17 +14733,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -14143,13 +14767,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -14162,34 +14785,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -14198,23 +14821,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -14233,8 +14856,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -14242,24 +14865,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -14269,14 +14892,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -14284,7 +14904,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -14309,18 +14929,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -14329,14 +14948,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -14353,12 +14972,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -14435,7 +15054,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -15019,11 +15638,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -15039,7 +15660,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -15064,7 +15685,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -15383,6 +16004,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -15441,6 +16072,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -15589,16 +16230,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -15622,22 +16263,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -15653,7 +16294,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -15680,22 +16343,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -15715,10 +16385,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -15745,7 +16415,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -15782,7 +16452,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -15798,9 +16468,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -19053,7 +19732,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -19174,17 +19853,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -19194,7 +19873,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -19219,7 +19898,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -19234,7 +19913,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -19579,8 +20258,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -19604,7 +20281,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -19656,7 +20333,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -19697,20 +20374,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -19770,19 +20447,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -20960,17 +21638,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -20980,7 +21658,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -21005,7 +21683,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -21021,7 +21699,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -21164,6 +21842,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -21257,6 +21944,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -21381,7 +22095,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -21392,7 +22106,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -21403,7 +22117,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -21414,7 +22128,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -21425,7 +22139,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -21518,6 +22232,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -21686,7 +22412,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -21694,7 +22420,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -21945,7 +22671,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -21979,11 +22705,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -22274,7 +23002,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -22403,11 +23142,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -22441,6 +23181,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -22508,7 +23273,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -22541,7 +23306,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -22662,7 +23427,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -23581,7 +24346,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -23818,7 +24583,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -23831,15 +24595,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -24968,8 +25729,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -24986,6 +25745,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -25002,7 +25762,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -25016,7 +25776,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -25088,9 +25847,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -25109,7 +25866,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -25187,8 +25944,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -25205,6 +25960,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -25221,7 +25977,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -25235,7 +25991,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -25307,9 +26062,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -25328,7 +26081,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -25451,8 +26204,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -25502,8 +26253,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -25685,7 +26434,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -25852,13 +26601,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -25899,6 +26646,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -25979,7 +26736,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -26106,49 +26863,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | SayHello 200 response
-400 | ApiResponseFor400 | ApiError 400 response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | SayHello 200 response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | ApiError 400 response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -26158,22 +26913,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -26181,7 +26946,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -26258,11 +27023,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -26290,10 +27056,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -26304,7 +27072,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Hello\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -26414,7 +27182,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -26423,7 +27191,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -26533,9 +27301,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -26565,6 +27334,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -26807,7 +27578,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -26836,8 +27607,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -26864,7 +27652,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -26911,8 +27698,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -27007,7 +27797,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -27025,7 +27815,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -27088,8 +27878,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -27128,12 +27916,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -27192,7 +27985,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -27221,7 +28014,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -27233,7 +28026,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -27249,7 +28042,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -27288,14 +28081,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -27312,23 +28105,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -27349,6 +28125,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -27368,13 +28157,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -27416,8 +28208,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -27487,7 +28279,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -27544,15 +28336,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -27564,7 +28359,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -27757,7 +28552,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -27829,9 +28624,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -27875,24 +28670,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -27948,7 +28743,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -27982,17 +28777,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -28017,12 +28811,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -28370,14 +29164,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -28395,26 +29191,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -28739,6 +29515,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -28828,19 +29608,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -28889,6 +29676,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -28910,6 +29698,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -28919,36 +29708,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -28971,6 +29760,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -28992,6 +29782,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -29001,36 +29792,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -29053,6 +29844,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -29074,6 +29866,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -29083,36 +29876,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -29135,6 +29928,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -29156,6 +29950,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -29165,36 +29960,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -29208,7 +30003,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -29242,6 +30037,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -29252,6 +30048,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -29263,15 +30060,328 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
+NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
+SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
+SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
+_status_code_to_response = {
+    '200': _response_for_200,
+    '400': _response_for_400,
+}
+_all_accept_content_types = (
+    'application/json',
+)
+
+
+class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        \\"\\"\\"
+        :param skip_deserialization: If true then api_response.response will be set but
+            api_response.body and api_response.headers will not be deserialized into schema
+            class instances
+        \\"\\"\\"
+        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
+        used_path = path.value
+
+        prefix_separator_iterator = None
+        for parameter in (
+            request_query_name,
+        ):
+            parameter_data = query_params.get(parameter.name, schemas.unset)
+            if parameter_data is schemas.unset:
+                continue
+            if prefix_separator_iterator is None:
+                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
+            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
+            for serialized_value in serialized_data.values():
+                used_path += serialized_value
+
+        _headers = HTTPHeaderDict()
+        # TODO add cookie handling
+        if accept_content_types:
+            for accept_content_type in accept_content_types:
+                _headers.add('Accept', accept_content_type)
+
+        response = self.api_client.call_api(
+            resource_path=used_path,
+            method='get'.upper(),
+            headers=_headers,
+            stream=stream,
+            timeout=timeout,
+        )
+
+        if skip_deserialization:
+            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+        else:
+            response_for_status = _status_code_to_response.get(str(response.status))
+            if response_for_status:
+                api_response = response_for_status.deserialize(response, self.api_client.configuration)
+            else:
+                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+
+        if not 200 <= response.status <= 299:
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
+
+        return api_response
+
+
+class SayHello(BaseApi):
+    # this class is used by api classes that refer to endpoints with operationId fn names
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
+        return self._say_hello_oapg(
+            query_params=query_params,
+            accept_content_types=accept_content_types,
+            stream=stream,
+            timeout=timeout,
+            skip_deserialization=skip_deserialization
+        )
+
+
+",
+  "generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
+
+\\"\\"\\"
+
+
+    Generated by: https://openapi-generator.tech
+\\"\\"\\"
+
+from dataclasses import dataclass
+import typing_extensions
+import urllib3
+from urllib3._collections import HTTPHeaderDict
+
+from test_my_api_python import api_client, exceptions
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from test_my_api_python import schemas  # noqa: F401
+
+from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
+from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
+
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -29328,28 +30438,55 @@ _response_for_400 = api_client.OpenApiResponse(
             schema=SchemaFor400ResponseBodyApplicationJson),
     },
 )
-_status_code_to_response = {
-    '200': _response_for_200,
-    '400': _response_for_400,
-}
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -29395,7 +30532,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -29403,40 +30544,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
+    ]: ...
 
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    def get(
-        self: BaseApi,
+    @typing.overload
+    def say_hello(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -29446,144 +30596,52 @@ class ApiForget(BaseApi):
         )
 
 
-",
-  "generated/python/test_my_api_python/paths/hello/get.pyi": "# coding: utf-8
-
-\\"\\"\\"
-
-
-    Generated by: https://openapi-generator.tech
-\\"\\"\\"
-
-from dataclasses import dataclass
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from test_my_api_python import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from test_my_api_python import schemas  # noqa: F401
-
-from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
-from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
-
-# query params
-NameSchema = schemas.StrSchema
-SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
-SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
+class ApiForget(BaseApi):
+    # this class is used by api classes that refer to endpoints by path and http method names
 
-    def _say_hello_oapg(
-        self: api_client.Api,
+    @typing.overload
+    def get(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        \\"\\"\\"
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        \\"\\"\\"
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_name,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
+    ]: ...
 
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SayHello(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
 
-    def say_hello(
-        self: BaseApi,
+    @typing.overload
+    def get(
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
-        return self._say_hello_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
 
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -29742,6 +30800,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -29865,6 +30924,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -29899,17 +30959,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -29997,14 +31057,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -30012,15 +31085,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -30033,9 +31106,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -30044,17 +31125,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -30093,8 +31172,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -30103,21 +31244,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -30127,6 +31255,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -30171,16 +31307,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -30197,7 +31333,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -30285,12 +31421,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -30299,14 +31435,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -30323,7 +31459,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -30341,17 +31477,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -30384,35 +31536,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -30434,7 +31790,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -30446,147 +31802,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -30654,7 +31885,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -30664,7 +31895,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -30679,14 +31910,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -30708,9 +31939,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -30774,9 +32005,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -30807,7 +32038,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -30836,7 +32067,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -30844,7 +32075,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -30902,7 +32133,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -30919,7 +32150,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -30940,7 +32171,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -30950,7 +32181,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -30960,7 +32191,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -30970,7 +32201,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -31013,6 +32244,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -31022,6 +32254,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -31037,7 +32270,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -31047,7 +32280,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -31058,7 +32291,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -31146,7 +32379,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -31161,21 +32394,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -31274,9 +32510,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -31284,6 +32518,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -31300,7 +32535,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -31310,7 +32545,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -31347,7 +32582,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -31372,6 +32607,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -31470,18 +32706,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -31532,8 +32761,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -31548,12 +32778,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -31572,6 +32803,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -31583,9 +32815,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -31636,7 +32869,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -31673,8 +32908,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -31696,13 +32932,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -31723,7 +32959,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -31733,12 +32968,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -31748,12 +32982,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -31764,14 +32997,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -31810,15 +33043,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -31829,10 +33080,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -31843,10 +33112,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -31855,17 +33142,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -31873,13 +33176,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -31892,34 +33194,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -31928,23 +33230,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -31963,8 +33265,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -31972,24 +33274,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -31999,14 +33301,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -32014,7 +33313,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -32039,18 +33338,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -32059,14 +33357,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -32083,12 +33381,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -32170,7 +33468,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -32755,11 +34053,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -32775,7 +34075,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -32800,7 +34100,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -33119,6 +34419,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -33177,6 +34487,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -33325,16 +34645,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -33358,22 +34678,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -33389,7 +34709,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -33416,22 +34758,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -33451,10 +34800,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -33481,7 +34830,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -33518,7 +34867,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -33534,9 +34883,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -36776,7 +38134,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -36897,17 +38255,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -36917,7 +38275,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -36942,7 +38300,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -36957,7 +38315,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -37302,8 +38660,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -37327,7 +38683,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -37379,7 +38735,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -37420,20 +38776,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -37493,19 +38849,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -38683,17 +40040,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -38703,7 +40060,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -38728,7 +40085,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -38744,7 +40101,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -38887,6 +40244,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -38980,6 +40346,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -39104,7 +40497,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -39115,7 +40508,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -39126,7 +40519,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -39137,7 +40530,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -39148,7 +40541,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -39241,6 +40634,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -39409,7 +40814,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -39417,7 +40822,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -39668,7 +41073,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -39702,11 +41107,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -39997,7 +41404,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -40126,11 +41544,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -40164,6 +41583,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -40231,7 +41675,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -40264,7 +41708,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -40385,7 +41829,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -41304,7 +42748,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -41541,7 +42985,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -41554,15 +42997,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -42691,8 +44131,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -42709,6 +44147,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -42725,7 +44164,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -42739,7 +44178,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -42811,9 +44249,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -42832,7 +44268,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -42910,8 +44346,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -42928,6 +44362,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -42944,7 +44379,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -42958,7 +44393,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -43030,9 +44464,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -43051,7 +44483,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -43174,8 +44606,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -43225,8 +44655,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -43408,7 +44836,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -43575,13 +45003,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -43622,6 +45048,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -43702,7 +45138,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -43829,48 +45265,46 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | SayHello 200 response
-400 | ApiResponseFor400 | ApiError 400 response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | SayHello 200 response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | ApiError 400 response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
 
 ### Authorization
 
@@ -43881,22 +45315,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -43904,7 +45348,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -43981,11 +45425,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -44013,10 +45458,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -44027,7 +45474,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Hello\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -44137,7 +45584,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -44146,7 +45593,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -44256,9 +45703,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -44288,6 +45736,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -44530,7 +45980,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -44559,8 +46009,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -44587,7 +46054,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -44634,8 +46100,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -44730,7 +46199,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -44748,7 +46217,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -44811,8 +46280,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -44851,12 +46318,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -44915,7 +46387,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -44944,7 +46416,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -44956,7 +46428,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -44972,7 +46444,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -45011,14 +46483,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -45035,23 +46507,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -45072,6 +46527,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -45091,13 +46559,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -45139,8 +46610,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -45210,7 +46681,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -45267,15 +46738,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -45287,7 +46761,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -45480,7 +46954,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -45552,9 +47026,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -45598,24 +47072,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -45671,7 +47145,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -45705,17 +47179,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -45740,12 +47213,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -46093,14 +47566,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -46118,26 +47593,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -46462,6 +47917,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -46551,19 +48010,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -46612,6 +48078,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46633,6 +48100,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -46642,36 +48110,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -46694,6 +48162,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46715,6 +48184,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -46724,36 +48194,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -46776,6 +48246,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46797,6 +48268,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -46806,36 +48278,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -46858,6 +48330,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46879,6 +48352,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -46888,36 +48362,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -46931,7 +48405,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -46965,6 +48439,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -46975,6 +48450,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46986,15 +48462,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -47061,18 +48537,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -47118,7 +48625,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -47126,17 +48637,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -47149,17 +48692,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -47179,6 +48754,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -47189,6 +48765,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -47198,28 +48775,120 @@ from test_my_api_python import schemas  # noqa: F401
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
 SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -47265,7 +48934,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -47273,17 +48946,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -47296,17 +49001,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -47465,6 +49202,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -47588,6 +49326,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -47622,17 +49361,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -47720,14 +49459,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -47735,15 +49487,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -47756,9 +49508,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -47767,17 +49527,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -47816,8 +49574,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -47826,21 +49646,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -47850,6 +49657,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -47894,16 +49709,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -47920,7 +49735,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -48008,12 +49823,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -48022,14 +49837,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -48046,7 +49861,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -48064,17 +49879,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -48107,35 +49938,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -48157,7 +50192,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -48169,147 +50204,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -48377,7 +50287,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -48387,7 +50297,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -48402,14 +50312,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -48431,9 +50341,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -48497,9 +50407,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -48530,7 +50440,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -48559,7 +50469,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -48567,7 +50477,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -48625,7 +50535,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -48642,7 +50552,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -48663,7 +50573,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -48673,7 +50583,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -48683,7 +50593,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -48693,7 +50603,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -48736,6 +50646,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -48745,6 +50656,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -48760,7 +50672,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -48770,7 +50682,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -48781,7 +50693,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -48869,7 +50781,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -48884,21 +50796,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -48997,9 +50912,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -49007,6 +50920,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -49023,7 +50937,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -49033,7 +50947,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -49070,7 +50984,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -49095,6 +51009,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -49193,18 +51108,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -49255,8 +51163,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -49271,12 +51180,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -49295,6 +51205,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -49306,9 +51217,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -49359,7 +51271,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -49396,8 +51310,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -49419,13 +51334,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -49446,7 +51361,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -49456,12 +51370,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -49471,12 +51384,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -49487,14 +51399,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -49533,15 +51445,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -49552,10 +51482,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -49566,10 +51514,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -49578,17 +51544,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -49596,13 +51578,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -49615,34 +51596,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -49651,23 +51632,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -49686,8 +51667,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -49695,24 +51676,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -49722,14 +51703,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -49737,7 +51715,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -49762,18 +51740,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -49782,14 +51759,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -49806,12 +51783,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -49888,7 +51865,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -50472,11 +52449,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -50492,7 +52471,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -50517,7 +52496,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -50836,6 +52815,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -50894,6 +52883,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -51042,16 +53041,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -51075,22 +53074,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -51106,7 +53105,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -51133,22 +53154,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -51168,10 +53196,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -51198,7 +53226,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -51235,7 +53263,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -51251,9 +53279,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
@@ -54493,7 +56530,7 @@ src/test/java/com/generated/api/testmyapijava/client/api/DefaultApiTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/ApiErrorResponseContentTest.java
 src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseContentTest.java
 ",
-  "generated/java/.openapi-generator/VERSION": "6.0.1",
+  "generated/java/.openapi-generator/VERSION": "6.3.0",
   "generated/java/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -54614,17 +56651,17 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "com.google.code.gson/gson",
         "type": "runtime",
-        "version": "2.9.0",
+        "version": "2.9.1",
       },
       Object {
         "name": "com.squareup.okhttp3/logging-interceptor",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "com.squareup.okhttp3/okhttp",
         "type": "runtime",
-        "version": "4.9.3",
+        "version": "4.10.0",
       },
       Object {
         "name": "io.gsonfire/gson-fire",
@@ -54634,7 +56671,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "io.swagger/swagger-annotations",
         "type": "runtime",
-        "version": "1.6.5",
+        "version": "1.6.8",
       },
       Object {
         "name": "jakarta.annotation/jakarta.annotation-api",
@@ -54659,7 +56696,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.openapitools/jackson-databind-nullable",
         "type": "runtime",
-        "version": "0.2.2",
+        "version": "0.2.4",
       },
       Object {
         "name": "org.projectlombok/lombok",
@@ -54674,7 +56711,7 @@ src/test/java/com/generated/api/testmyapijava/client/model/SayHelloResponseConte
       Object {
         "name": "org.junit.jupiter/junit-jupiter-api",
         "type": "test",
-        "version": "5.8.2",
+        "version": "5.9.1",
       },
       Object {
         "name": "org.mockito/mockito-core",
@@ -55019,8 +57056,6 @@ components:
       - errorMessage
       type: object
     SayHelloResponseContent:
-      example:
-        message: message
       properties:
         message:
           type: string
@@ -55044,7 +57079,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -55096,7 +57131,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file(\\"\${project.buildDir}/outputs/jar\\")
             task.archiveName = \\"\${project.name}-\${variant.baseName}-\${version}.jar\\"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -55137,20 +57172,20 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation \\"com.google.code.findbugs:jsr305:3.0.2\\"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'javax.ws.rs:jsr311-api:1.1.1'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation \\"jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version\\"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
@@ -55210,19 +57245,20 @@ test {
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       \\"io.swagger\\" % \\"swagger-annotations\\" % \\"1.6.5\\",
-      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.9.3\\",
-      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.9.3\\",
-      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.0\\",
+      \\"com.squareup.okhttp3\\" % \\"okhttp\\" % \\"4.10.0\\",
+      \\"com.squareup.okhttp3\\" % \\"logging-interceptor\\" % \\"4.10.0\\",
+      \\"com.google.code.gson\\" % \\"gson\\" % \\"2.9.1\\",
       \\"org.apache.commons\\" % \\"commons-lang3\\" % \\"3.12.0\\",
       \\"javax.ws.rs\\" % \\"jsr311-api\\" % \\"1.1.1\\",
       \\"javax.ws.rs\\" % \\"javax.ws.rs-api\\" % \\"2.1.1\\",
-      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.3\\",
+      \\"org.openapitools\\" % \\"jackson-databind-nullable\\" % \\"0.2.4\\",
       \\"io.gsonfire\\" % \\"gson-fire\\" % \\"1.8.5\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
       \\"com.google.code.findbugs\\" % \\"jsr305\\" % \\"3.0.2\\" % \\"compile\\",
       \\"jakarta.annotation\\" % \\"jakarta.annotation-api\\" % \\"1.3.5\\" % \\"compile\\",
-      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.8.2\\" % \\"test\\",
-      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\"
+      \\"org.junit.jupiter\\" % \\"junit-jupiter-api\\" % \\"5.9.1\\" % \\"test\\",
+      \\"com.novocode\\" % \\"junit-interface\\" % \\"0.10\\" % \\"test\\",
+      \\"org.mockito\\" % \\"mockito-core\\" % \\"3.12.4\\" % \\"test\\"
     )
   )
 ",
@@ -56400,17 +58436,17 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -56420,7 +58456,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.5</version>
+            <version>1.6.8</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -56445,7 +58481,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -56461,7 +58497,7 @@ if \\"%OS%\\"==\\"Windows_NT\\" endlocal
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -56604,6 +58640,15 @@ import com.generated.api.testmyapijava.client.auth.ApiKeyAuth;
 public class ApiClient {
 
     private String basePath = \\"http://localhost\\";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      \\"\\",
+      \\"No description provided\\",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private Map<String, String> defaultCookieMap = new HashMap<String, String>();
@@ -56697,6 +58742,33 @@ public class ApiClient {
         return this;
     }
 
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -56821,7 +58893,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
+        JSON.setDateFormat(dateFormat);
         return this;
     }
 
@@ -56832,7 +58904,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
+        JSON.setSqlDateFormat(dateFormat);
         return this;
     }
 
@@ -56843,7 +58915,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
+        JSON.setOffsetDateTimeFormat(dateFormat);
         return this;
     }
 
@@ -56854,7 +58926,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
+        JSON.setLocalDateFormat(dateFormat);
         return this;
     }
 
@@ -56865,7 +58937,7 @@ public class ApiClient {
      * @return a {@link com.generated.api.testmyapijava.client.ApiClient} object
      */
     public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
+        JSON.setLenientOnJson(lenientOnJson);
         return this;
     }
 
@@ -56958,6 +59030,18 @@ public class ApiClient {
         throw new RuntimeException(\\"No OAuth2 authentication configured!\\");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException(\\"No AWS4 authentication configured!\\");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *
@@ -57126,7 +59210,7 @@ public class ApiClient {
             return \\"\\";
         } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
             //Serialize to json string and remove the \\" enclosing characters
-            String jsonStr = json.serialize(param);
+            String jsonStr = JSON.serialize(param);
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
@@ -57134,7 +59218,7 @@ public class ApiClient {
                 if (b.length() > 0) {
                     b.append(\\",\\");
                 }
-                b.append(String.valueOf(o));
+                b.append(o);
             }
             return b.toString();
         } else {
@@ -57385,7 +59469,7 @@ public class ApiClient {
             contentType = \\"application/json\\";
         }
         if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
+            return JSON.deserialize(respBody, returnType);
         } else if (returnType.equals(String.class)) {
             // Expecting string, return the raw response body.
             return (T) respBody;
@@ -57419,11 +59503,13 @@ public class ApiClient {
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
-                content = json.serialize(obj);
+                content = JSON.serialize(obj);
             } else {
                 content = null;
             }
             return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
         } else {
             throw new ApiException(\\"Content type \\\\\\"\\" + contentType + \\"\\\\\\" is not supported\\");
         }
@@ -57714,7 +59800,18 @@ public class ApiClient {
         if (baseUrl != null) {
             url.append(baseUrl).append(path);
         } else {
-            url.append(basePath).append(path);
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    \\"Invalid index %d when selecting the host settings. Must be less than %d\\", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
         }
 
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -57843,11 +59940,12 @@ public class ApiClient {
                 for (Object item: list) {
                     if (item instanceof File) {
                         addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
                     }
                 }
             } else {
-                Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + param.getKey() + \\"\\\\\\"\\");
-                mpBuilder.addPart(partHeaders, RequestBody.create(parameterToString(param.getValue()), null));
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
             }
         }
         return mpBuilder.build();
@@ -57881,6 +59979,31 @@ public class ApiClient {
         mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
     }
 
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse(\\"text/plain\\"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse(\\"application/json\\"));
+        }
+
+        Headers partHeaders = Headers.of(\\"Content-Disposition\\", \\"form-data; name=\\\\\\"\\" + key + \\"\\\\\\"\\");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
     /**
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
@@ -57948,7 +60071,7 @@ public class ApiClient {
                     KeyStore caKeyStore = newEmptyKeyStore(password);
                     int index = 0;
                     for (Certificate certificate : certificates) {
-                        String certificateAlias = \\"ca\\" + Integer.toString(index++);
+                        String certificateAlias = \\"ca\\" + (index++);
                         caKeyStore.setCertificateEntry(certificateAlias, certificate);
                     }
                     trustManagerFactory.init(caKeyStore);
@@ -57981,7 +60104,7 @@ public class ApiClient {
     /**
      * Convert the HTTP request body to a string.
      *
-     * @param request The HTTP request object
+     * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
      * @throws com.generated.api.testmyapijava.client.ApiException If fail to serialize the request body object into a string
      */
@@ -58102,7 +60225,7 @@ public class ApiException extends Exception {
      * @param responseBody the response body
      */
     public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+        this(\\"Response Code: \\" + code + \\" Response Body: \\" + responseBody, (Throwable) null, code, responseHeaders, responseBody);
     }
 
     /**
@@ -59021,7 +61144,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException(\\"The variable \\" + name + \\" in the server URL has invalid value \\" + value + \\".\\");
                 }
             }
-            url = url.replaceAll(\\"\\\\\\\\{\\" + name + \\"\\\\\\\\}\\", value);
+            url = url.replace(\\"{\\" + name + \\"}\\", value);
         }
         return url;
     }
@@ -59258,7 +61381,6 @@ public class DefaultApi {
         }
 
         final String[] localVarContentTypes = {
-            
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -59271,15 +61393,12 @@ public class DefaultApi {
 
     @SuppressWarnings(\\"rawtypes\\")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'name' is set
         if (name == null) {
             throw new ApiException(\\"Missing the required parameter 'name' when calling sayHello(Async)\\");
         }
-        
 
-        okhttp3.Call localVarCall = sayHelloCall(name, _callback);
-        return localVarCall;
+        return sayHelloCall(name, _callback);
 
     }
 
@@ -60408,8 +62527,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -60426,6 +62543,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -60442,7 +62560,7 @@ public class ApiErrorResponseContent {
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
   private String errorMessage;
 
-  public ApiErrorResponseContent() { 
+  public ApiErrorResponseContent() {
   }
 
   public ApiErrorResponseContent errorMessage(String errorMessage) {
@@ -60456,7 +62574,6 @@ public class ApiErrorResponseContent {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getErrorMessage() {
     return errorMessage;
@@ -60528,9 +62645,7 @@ public class ApiErrorResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (ApiErrorResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!ApiErrorResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in ApiErrorResponseContent is not found in the empty JSON string\\", ApiErrorResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -60549,7 +62664,7 @@ public class ApiErrorResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"errorMessage\\") != null && !jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"errorMessage\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`errorMessage\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"errorMessage\\").toString()));
       }
   }
@@ -60627,8 +62742,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 
 import com.google.gson.Gson;
@@ -60645,6 +62758,7 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -60661,7 +62775,7 @@ public class SayHelloResponseContent {
   @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
-  public SayHelloResponseContent() { 
+  public SayHelloResponseContent() {
   }
 
   public SayHelloResponseContent message(String message) {
@@ -60675,7 +62789,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-  @ApiModelProperty(required = true, value = \\"\\")
 
   public String getMessage() {
     return message;
@@ -60747,9 +62860,7 @@ public class SayHelloResponseContent {
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
       if (jsonObj == null) {
-        if (SayHelloResponseContent.openapiRequiredFields.isEmpty()) {
-          return;
-        } else { // has required fields
+        if (!SayHelloResponseContent.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
           throw new IllegalArgumentException(String.format(\\"The required field(s) %s in SayHelloResponseContent is not found in the empty JSON string\\", SayHelloResponseContent.openapiRequiredFields.toString()));
         }
       }
@@ -60768,7 +62879,7 @@ public class SayHelloResponseContent {
           throw new IllegalArgumentException(String.format(\\"The required field \`%s\` is not found in the JSON string: %s\\", requiredField, jsonObj.toString()));
         }
       }
-      if (jsonObj.get(\\"message\\") != null && !jsonObj.get(\\"message\\").isJsonPrimitive()) {
+      if (!jsonObj.get(\\"message\\").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format(\\"Expected the field \`message\` to be a primitive type in the JSON string but got \`%s\`\\", jsonObj.get(\\"message\\").toString()));
       }
   }
@@ -60891,8 +63002,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -60942,8 +63051,6 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -61125,7 +63232,7 @@ test_my_api_python/rest.py
 test_my_api_python/schemas.py
 tox.ini
 ",
-  "generated/python/.openapi-generator/VERSION": "6.1.0",
+  "generated/python/.openapi-generator/VERSION": "6.3.0",
   "generated/python/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -61292,13 +63399,11 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0
 - Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonExperimentalClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -61339,6 +63444,16 @@ object schema properties as classes
         - 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
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
@@ -61419,7 +63534,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 import time
 import test_my_api_python
 from pprint import pprint
-from test_my_api_python.apis import default_api
+from test_my_api_python.apis.tags import default_api
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 # Defining the host is optional and defaults to http://localhost
@@ -61546,49 +63661,47 @@ Name | Type | Description  | Notes
 name | NameSchema | | 
 
 
-#### NameSchema
+# NameSchema
 
-Type | Description | Notes
-------------- | ------------- | -------------
-**str** |  | 
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+str,  | str,  |  | 
 
 ### Return Types, Responses
 
 Code | Class | Description
 ------------- | ------------- | -------------
 n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | ApiResponseFor200 | SayHello 200 response
-400 | ApiResponseFor400 | ApiError 400 response
+200 | [ApiResponseFor200](#say_hello.ApiResponseFor200) | SayHello 200 response
+400 | [ApiResponseFor400](#say_hello.ApiResponseFor400) | ApiError 400 response
 
-#### ApiResponseFor200
+#### say_hello.ApiResponseFor200
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor200ResponseBodyApplicationJson
+# SchemaFor200ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**SayHelloResponseContent**](SayHelloResponseContent.md) |  | 
+[**SayHelloResponseContent**](../../models/SayHelloResponseContent.md) |  | 
 
 
-#### ApiResponseFor400
+#### say_hello.ApiResponseFor400
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 response | urllib3.HTTPResponse | Raw response |
 body | typing.Union[SchemaFor400ResponseBodyApplicationJson, ] |  |
 headers | Unset | headers were not defined |
 
-#### SchemaFor400ResponseBodyApplicationJson
+# SchemaFor400ResponseBodyApplicationJson
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**ApiErrorResponseContent**](ApiErrorResponseContent.md) |  | 
-
+[**ApiErrorResponseContent**](../../models/ApiErrorResponseContent.md) |  | 
 
 
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
 ### Authorization
 
 No authorization required
@@ -61598,22 +63711,32 @@ No authorization required
 ",
   "generated/python/docs/models/ApiErrorResponseContent.md": "# test_my_api_python.model.api_error_response_content.ApiErrorResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**errorMessage** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**errorMessage** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
 ",
   "generated/python/docs/models/SayHelloResponseContent.md": "# test_my_api_python.model.say_hello_response_content.SayHelloResponseContent
 
-#### Properties
-Name | Type | Description | Notes
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**message** | **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]
+dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**message** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | 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)
 
@@ -61621,7 +63744,7 @@ Name | Type | Description | Notes
   "generated/python/git_push.sh": "#!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl \\"minor update\\" \\"gitlab.com\\"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl \\"minor update\\" \\"gitlab.com\\"
 
 git_user_id=$1
 git_repo_id=$2
@@ -61698,11 +63821,12 @@ git push origin master 2>&1 | grep -v 'To https'
   "generated/python/requirements-dev.txt": "# ~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".
 projen==99.99.99
 ",
-  "generated/python/requirements.txt": "certifi >= 14.05.14
-frozendict >= 2.0.3
-python_dateutil >= 2.5.3
+  "generated/python/requirements.txt": "certifi >= 14.5.14
+frozendict ~= 2.3.4
+python-dateutil ~= 2.7.0
 setuptools >= 21.0.0
-urllib3 >= 1.15.1
+typing_extensions ~= 4.3.0
+urllib3 ~= 1.26.7
 ",
   "generated/python/setup.cfg": "[flake8]
 max-line-length=99
@@ -61730,10 +63854,12 @@ VERSION = \\"1.0.0\\"
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  \\"urllib3 >= 1.15\\",
-  \\"certifi\\",
-  \\"python-dateutil\\",
-  \\"frozendict >= 2.0.3\\",
+    \\"certifi >= 14.5.14\\",
+    \\"frozendict ~= 2.3.4\\",
+    \\"python-dateutil ~= 2.7.0\\",
+    \\"setuptools >= 21.0.0\\",
+    \\"typing_extensions ~= 4.3.0\\",
+    \\"urllib3 ~= 1.26.7\\",
 ]
 
 setup(
@@ -61744,7 +63870,7 @@ setup(
     author_email=\\"team@openapitools.org\\",
     url=\\"\\",
     keywords=[\\"OpenAPI\\", \\"OpenAPI-Generator\\", \\"Hello\\"],
-    python_requires=\\">=3.9\\",
+    python_requires=\\">=3.7\\",
     install_requires=REQUIRES,
     packages=find_packages(exclude=[\\"test\\", \\"tests\\"]),
     include_package_data=True,
@@ -61854,7 +63980,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -61863,7 +63989,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
@@ -61973,9 +64099,10 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 
 import frozendict
@@ -62005,6 +64132,8 @@ class RequestField(RequestFieldBase):
 
 
 class JSONEncoder(json.JSONEncoder):
+    compact_separators = (',', ':')
+
     def default(self, obj):
         if isinstance(obj, str):
             return str(obj)
@@ -62247,7 +64376,7 @@ class StyleFormSerializer(ParameterSerializerBase):
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> str:
         if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('?', '&')
+            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
         return self._ref6570_expansion(
             variable_name=name,
             in_data=in_data,
@@ -62276,8 +64405,25 @@ class StyleSimpleSerializer(ParameterSerializerBase):
         )
 
 
+class JSONDetector:
+    \\"\\"\\"
+    Works for:
+    application/json
+    application/json; charset=UTF-8
+    application/json-patch+json
+    application/geo+json
+    \\"\\"\\"
+    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
+
+    @classmethod
+    def _content_type_is_json(cls, content_type: str) -> bool:
+        if cls.__json_content_type_pattern.match(content_type):
+            return True
+        return False
+
+
 @dataclass
-class ParameterBase:
+class ParameterBase(JSONDetector):
     name: str
     in_type: ParameterInType
     required: bool
@@ -62304,7 +64450,6 @@ class ParameterBase:
     }
     __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
     _json_encoder = JSONEncoder()
-    _json_content_type = 'application/json'
 
     @classmethod
     def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
@@ -62351,8 +64496,11 @@ class ParameterBase:
 
     def _serialize_json(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
+        in_data: typing.Union[None, int, float, str, bool, dict, list],
+        eliminate_whitespace: bool = False
     ) -> str:
+        if eliminate_whitespace:
+            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
         return json.dumps(in_data)
 
 
@@ -62447,7 +64595,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -62465,7 +64613,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         schema: typing.Optional[typing.Type[Schema]] = None,
         content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
     ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
+        used_style = ParameterStyle.FORM if style is None else style
         used_explode = self._get_default_explode(used_style) if explode is None else explode
 
         super().__init__(
@@ -62528,8 +64676,6 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
         return self._to_dict(self.name, value)
 
     def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if not self.schema:
-            return None
         if self.style is ParameterStyle.FORM:
             return PrefixSeparatorIterator('?', '&')
         elif self.style is ParameterStyle.SPACE_DELIMITED:
@@ -62568,12 +64714,17 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
                 elif self.style is ParameterStyle.PIPE_DELIMITED:
                     return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
         # self.content will be length one
+        if prefix_separator_iterator is None:
+            prefix_separator_iterator = self.get_prefix_separator_iterator()
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
+            if self._content_type_is_json(content_type):
+                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
+                return self._to_dict(
+                    self.name,
+                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
+                )
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -62632,7 +64783,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self._to_dict(self.name, value)
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -62661,7 +64812,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -62673,7 +64824,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -62689,7 +64840,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         for content_type, schema in self.content.items():
             cast_in_data = schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
-            if content_type == self._json_content_type:
+            if self._content_type_is_json(content_type):
                 value = self._serialize_json(cast_in_data)
                 return self.__to_headers(((self.name, value),))
             raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
@@ -62728,14 +64879,14 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+    body: typing.Union[Unset, Schema] = unset
+    headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
 
     def __init__(
         self,
         response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        body: typing.Union[Unset, Schema] = unset,
+        headers: typing.Union[Unset, typing.Dict[str, Schema]] = unset
     ):
         \\"\\"\\"
         pycharm needs this to prevent 'Unexpected argument' warnings
@@ -62752,23 +64903,6 @@ class ApiResponseWithoutDeserialization(ApiResponse):
     headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
 
 
-class JSONDetector:
-    \\"\\"\\"
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    \\"\\"\\"
-    __json_content_type_pattern = re.compile(\\"application/[^+]*[+]?(json);?.*\\")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
 class OpenApiResponse(JSONDetector):
     __filename_content_disposition_pattern = re.compile('filename=\\"(.+?)\\"')
 
@@ -62789,6 +64923,19 @@ class OpenApiResponse(JSONDetector):
         # python must be >= 3.9 so we can pass in bytes into json.loads
         return json.loads(response.data)
 
+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
     @classmethod
     def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
         if content_disposition is None:
@@ -62808,13 +64955,16 @@ class OpenApiResponse(JSONDetector):
             a file will be written and returned
         \\"\\"\\"
         if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )
 
             if file_name is None:
                 _fd, path = tempfile.mkstemp()
             else:
                 path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
             with open(path, 'wb') as new_file:
                 chunk_size = 1024
                 while True:
@@ -62856,8 +65006,8 @@ class OpenApiResponse(JSONDetector):
         if self.content is not None:
             if content_type not in self.content:
                 raise ApiValueError(
-                    f'Invalid content_type={content_type} returned for response with '
-                    'status_code={str(response.status)}'
+                    f\\"Invalid content_type returned. Content_type='{content_type}' was returned \\"
+                    f\\"when only {str(set(self.content))} are defined for status_code={str(response.status)}\\"
                 )
             body_schema = self.content[content_type].schema
             if body_schema is None:
@@ -62927,7 +65077,7 @@ class ApiClient:
         self.pool_threads = pool_threads
 
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {}
+        self.default_headers = HTTPHeaderDict()
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
@@ -62984,15 +65134,18 @@ class ApiClient:
     ) -> urllib3.HTTPResponse:
 
         # header parameters
-        headers = headers or {}
-        headers.update(self.default_headers)
+        used_headers = HTTPHeaderDict(self.default_headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path
@@ -63004,7 +65157,7 @@ class ApiClient:
         response = self.request(
             method,
             url,
-            headers=headers,
+            headers=used_headers,
             fields=fields,
             body=body,
             stream=stream,
@@ -63197,7 +65350,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         \\"\\"\\"
         Ensures that:
         - required keys are present
@@ -63269,9 +65422,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
@@ -63315,24 +65468,24 @@ class RequestBody(StyleFormSerializer, JSONDetector):
 
     def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
         json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
+        request_field = RequestField(name=key, data=json.dumps(json_value))
+        request_field.make_multipart(content_type='application/json')
+        return request_field
 
     def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
         if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
+            request_field = RequestField(name=key, data=str(value))
+            request_field.make_multipart(content_type='text/plain')
         elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
+            request_field = RequestField(name=key, data=value)
+            request_field.make_multipart(content_type='application/octet-stream')
         elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
-            )
+            # TODO use content.encoding to limit allowed content types if they are present
+            request_field = RequestField.from_tuples(key, (os.path.basename(value.name), value.read()))
             value.close()
-            return request_field
         else:
-            return self.__multipart_json_item(key=key, value=value)
+            request_field = self.__multipart_json_item(key=key, value=value)
+        return request_field
 
     def __serialize_multipart_form_data(
         self, in_data: Schema
@@ -63388,7 +65541,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             raise ValueError(
                 f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
         cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=False)
+        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
         return dict(body=value)
 
     def serialize(
@@ -63422,17 +65575,16 @@ class RequestBody(StyleFormSerializer, JSONDetector):
             return self.__serialize_application_x_www_form_data(cast_in_data)
         elif content_type == 'application/octet-stream':
             return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
-",
+        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))",
   "generated/python/test_my_api_python/apis/__init__.py": "# do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints then import them from
 # tags, paths, or path_to_api, or tag_to_api",
-  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/path_to_api.py": "import typing_extensions
 
 from test_my_api_python.paths import PathValues
 from test_my_api_python.apis.paths.hello import Hello
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.HELLO: Hello,
@@ -63457,12 +65609,12 @@ class Hello(
 ):
     pass
 ",
-  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing
+  "generated/python/test_my_api_python/apis/tag_to_api.py": "import typing_extensions
 
 from test_my_api_python.apis.tags import TagValues
 from test_my_api_python.apis.tags.default_api import DefaultApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.DEFAULT: DefaultApi,
@@ -63810,14 +65962,16 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host=None,
-                 api_key=None, api_key_prefix=None,
-                 username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations=\\"\\",
-                 server_index=None, server_variables=None,
-                 server_operation_index=None, server_operation_variables=None,
-                 ):
+    def __init__(
+        self,
+        host=None,
+        discard_unknown_keys=False,
+        disabled_client_side_validations=\\"\\",
+        server_index=None,
+        server_variables=None,
+        server_operation_index=None,
+        server_operation_variables=None,
+    ):
         \\"\\"\\"Constructor
         \\"\\"\\"
         self._base_path = \\"http://localhost\\" if host is None else host
@@ -63835,26 +65989,6 @@ class Configuration(object):
         \\"\\"\\"Temp file folder for downloading files
         \\"\\"\\"
         # Authentication Settings
-        self.api_key = {}
-        if api_key:
-            self.api_key = api_key
-        \\"\\"\\"dict to store API key(s)
-        \\"\\"\\"
-        self.api_key_prefix = {}
-        if api_key_prefix:
-            self.api_key_prefix = api_key_prefix
-        \\"\\"\\"dict to store API prefix (e.g. Bearer)
-        \\"\\"\\"
-        self.refresh_api_key_hook = None
-        \\"\\"\\"function hook to refresh API key if expired
-        \\"\\"\\"
-        self.username = username
-        \\"\\"\\"Username for HTTP basic authentication
-        \\"\\"\\"
-        self.password = password
-        \\"\\"\\"Password for HTTP basic authentication
-        \\"\\"\\"
-        self.discard_unknown_keys = discard_unknown_keys
         self.disabled_client_side_validations = disabled_client_side_validations
         self.logger = {}
         \\"\\"\\"Logging Settings
@@ -64179,6 +66313,10 @@ class Configuration(object):
     The version of the OpenAPI document: 1.0
     Generated by: https://openapi-generator.tech
 \\"\\"\\"
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -64268,19 +66406,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar(\\"T\\")
 
-    def __init__(self, status=None, reason=None, api_response: 'test_my_api_python.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         \\"\\"\\"Custom error messages for exception\\"\\"\\"
@@ -64329,6 +66474,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -64350,6 +66496,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -64359,36 +66506,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -64411,6 +66558,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -64432,6 +66580,7 @@ class ApiErrorResponseContent(
         required = {
             \\"errorMessage\\",
         }
+        
         class properties:
             errorMessage = schemas.StrSchema
             __annotations__ = {
@@ -64441,36 +66590,36 @@ class ApiErrorResponseContent(
     errorMessage: MetaOapg.properties.errorMessage
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"errorMessage\\"]) -> MetaOapg.properties.errorMessage: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"errorMessage\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"errorMessage\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         errorMessage: typing.Union[MetaOapg.properties.errorMessage, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiErrorResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             errorMessage=errorMessage,
             _configuration=_configuration,
             **kwargs,
@@ -64493,6 +66642,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -64514,6 +66664,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -64523,36 +66674,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -64575,6 +66726,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -64596,6 +66748,7 @@ class SayHelloResponseContent(
         required = {
             \\"message\\",
         }
+        
         class properties:
             message = schemas.StrSchema
             __annotations__ = {
@@ -64605,36 +66758,36 @@ class SayHelloResponseContent(
     message: MetaOapg.properties.message
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
+    def get_item_oapg(self, name: typing_extensions.Literal[\\"message\\"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal[\\"message\\", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[\\"message\\", ], str]):
         return super().get_item_oapg(name)
     
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
+        *_args: typing.Union[dict, frozendict.frozendict, ],
         message: typing.Union[MetaOapg.properties.message, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
         **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SayHelloResponseContent':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             message=message,
             _configuration=_configuration,
             **kwargs,
@@ -64648,7 +66801,7 @@ class SayHelloResponseContent(
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from test_my_api_python.model.pet import Pet
+# from test_my_api_python.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
@@ -64682,6 +66835,7 @@ path = PathValues.HELLO",
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -64692,6 +66846,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -64703,15 +66858,15 @@ from test_my_api_python.model.say_hello_response_content import SayHelloResponse
 
 from . import path
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'name': typing.Union[NameSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -64778,18 +66933,49 @@ _all_accept_content_types = (
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -64835,7 +67021,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -64843,17 +67033,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -64866,17 +67088,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -64896,6 +67150,7 @@ class ApiForget(BaseApi):
 \\"\\"\\"
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -64906,6 +67161,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -64915,28 +67171,120 @@ from test_my_api_python import schemas  # noqa: F401
 from test_my_api_python.model.api_error_response_content import ApiErrorResponseContent
 from test_my_api_python.model.say_hello_response_content import SayHelloResponseContent
 
-# query params
+# Query params
 NameSchema = schemas.StrSchema
+RequestRequiredQueryParams = typing_extensions.TypedDict(
+    'RequestRequiredQueryParams',
+    {
+        'name': typing.Union[NameSchema, str, ],
+    }
+)
+RequestOptionalQueryParams = typing_extensions.TypedDict(
+    'RequestOptionalQueryParams',
+    {
+    },
+    total=False
+)
+
+
+class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
+    pass
+
+
+request_query_name = api_client.QueryParameter(
+    name=\\"name\\",
+    style=api_client.ParameterStyle.FORM,
+    schema=NameSchema,
+    required=True,
+    explode=True,
+)
 SchemaFor200ResponseBodyApplicationJson = SayHelloResponseContent
+
+
+@dataclass
+class ApiResponseFor200(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor200ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_200 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor200,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor200ResponseBodyApplicationJson),
+    },
+)
 SchemaFor400ResponseBodyApplicationJson = ApiErrorResponseContent
+
+
+@dataclass
+class ApiResponseFor400(api_client.ApiResponse):
+    response: urllib3.HTTPResponse
+    body: typing.Union[
+        SchemaFor400ResponseBodyApplicationJson,
+    ]
+    headers: schemas.Unset = schemas.unset
+
+
+_response_for_400 = api_client.OpenApiResponse(
+    response_cls=ApiResponseFor400,
+    content={
+        'application/json': api_client.MediaType(
+            schema=SchemaFor400ResponseBodyApplicationJson),
+    },
+)
 _all_accept_content_types = (
     'application/json',
 )
 
 
 class BaseApi(api_client.Api):
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
 
+    @typing.overload
     def _say_hello_oapg(
-        self: api_client.Api,
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def _say_hello_oapg(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         \\"\\"\\"
         :param skip_deserialization: If true then api_response.response will be set but
             api_response.body and api_response.headers will not be deserialized into schema
@@ -64982,7 +67330,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 
@@ -64990,17 +67342,49 @@ class BaseApi(api_client.Api):
 class SayHello(BaseApi):
     # this class is used by api classes that refer to endpoints with operationId fn names
 
+    @typing.overload
     def say_hello(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def say_hello(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -65013,17 +67397,49 @@ class SayHello(BaseApi):
 class ApiForget(BaseApi):
     # this class is used by api classes that refer to endpoints by path and http method names
 
+    @typing.overload
     def get(
-        self: BaseApi,
+        self,
         query_params: RequestQueryParams = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
+        skip_deserialization: typing_extensions.Literal[False] = ...,
+    ) -> typing.Union[
+        ApiResponseFor200,
+    ]: ...
+
+    @typing.overload
+    def get(
+        self,
+        skip_deserialization: typing_extensions.Literal[True],
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    ) -> api_client.ApiResponseWithoutDeserialization: ...
+
+    @typing.overload
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = ...,
     ) -> typing.Union[
         ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization
-    ]:
+        api_client.ApiResponseWithoutDeserialization,
+    ]: ...
+
+    def get(
+        self,
+        query_params: RequestQueryParams = frozendict.frozendict(),
+        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+        stream: bool = False,
+        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+        skip_deserialization: bool = False,
+    ):
         return self._say_hello_oapg(
             query_params=query_params,
             accept_content_types=accept_content_types,
@@ -65182,6 +67598,7 @@ class RESTClientObject(object):
                 elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                     r = self.pool_manager.request(
                         method, url,
+                        body=body,
                         fields=fields,
                         encode_multipart=False,
                         preload_content=not stream,
@@ -65305,6 +67722,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -65339,17 +67757,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
+            if _arg.closed:
                 raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
+            _arg.close()
+            inst = super(FileIO, cls).__new__(cls, _arg.name)
+            super(FileIO, inst).__init__(_arg.name)
             return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
+        raise ApiValueError('FileIO must be passed _arg which contains the open file')
 
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -65437,14 +67855,27 @@ class ValidationMetadata(frozendict.frozendict):
         return self.get('validated_path_to_schemas')
 
 
+def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_to_schemas: dict):
+    # this is called if validation_ran_earlier and current and deeper locations need to be added
+    current_path_to_item = validation_metadata.path_to_item
+    other_path_to_schemas = {}
+    for path_to_item, schemas in validation_metadata.validated_path_to_schemas.items():
+        if len(path_to_item) < len(current_path_to_item):
+            continue
+        path_begins_with_current_path = path_to_item[:len(current_path_to_item)] == current_path_to_item
+        if path_begins_with_current_path:
+            other_path_to_schemas[path_to_item] = schemas
+    update(path_to_schemas, other_path_to_schemas)
+
+
 class Singleton:
     \\"\\"\\"
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
+    The same instance is returned for a given key of (cls, _arg)
     \\"\\"\\"
     _instances = {}
 
-    def __new__(cls, arg: typing.Any, **kwargs):
+    def __new__(cls, _arg: typing.Any, **kwargs):
         \\"\\"\\"
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -65452,15 +67883,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         \\"\\"\\"
-        key = (cls, arg, str(arg))
+        key = (cls, _arg, str(_arg))
         if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, arg)
+                cls._instances[key] = super().__new__(cls, _arg)
         return cls._instances[key]
 
     def __repr__(self):
@@ -65473,9 +67904,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -65484,17 +67923,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -65533,8 +67970,70 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     \\"\\"\\"
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return \\"is {0}\\".format(all_class_names[0])
+        return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
+
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        \\"\\"\\"
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        \\"\\"\\"
+        key_or_value = \\"value\\"
+        if key_type:
+            key_or_value = \\"key\\"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -65543,21 +68042,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         \\"\\"\\"
         Schema _validate_oapg
-        Runs all schema validation logic and
-        returns a dynamic class of different bases depending upon the input
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
+        All keyword validation except for type checking was done in calling stack frames
+        If those validations passed, the validated classes are collected in path_to_schemas
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -65567,6 +68053,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         \\"\\"\\"
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -65611,16 +68105,16 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         \\"\\"\\"
         _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
+        if validation_metadata.validation_ran_earlier(cls):
+            add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
+        else:
             other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
@@ -65637,7 +68131,7 @@ class Schema:
             \\"\\"\\"
             cls._process_schema_classes_oapg(schema_classes)
             enum_schema = any(
-                hasattr(this_cls, '_enum_value_to_name') for this_cls in schema_classes)
+                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
             chosen_schema_classes = schema_classes - inheritable_primitive_type
             suffix = tuple(inheritable_primitive_type)
@@ -65725,12 +68219,12 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         \\"\\"\\"
         Schema __new__
 
         Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
             _configuration: contains the Configuration that enables json schema validation keywords
                 like minItems, minLength etc
@@ -65739,14 +68233,14 @@ class Schema:
         are instance properties if they are named normally :(
         \\"\\"\\"
         __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
+        if not _args and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
+        if not __kwargs and _args and not isinstance(_args[0], dict):
+            __arg = _args[0]
         else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
+            __arg = cls.__get_input_dict(*_args, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __arg = cast_to_allowed_types(
@@ -65763,7 +68257,7 @@ class Schema:
 
     def __init__(
         self,
-        *args: typing.Union[
+        *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
@@ -65781,17 +68275,33 @@ class Schema:
 \\"\\"\\"
 import itertools
 data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-[v for v in itertools.combinations(data_types, 2)]
+type_to_cls = {
+    'None': 'NoneClass',
+    'FrozenDict': 'frozendict.frozendict',
+    'Tuple': 'tuple',
+    'Str': 'str',
+    'Decimal': 'decimal.Decimal',
+    'Bool': 'BoolClass'
+}
+cls_tuples = [v for v in itertools.combinations(data_types, 5)]
+typed_classes = [f\\"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\\\\n    pass\\" for cls_tuple in cls_tuples]
+for cls in typed_classes:
+    print(cls)
+object_classes = [f\\"{''.join(cls_tuple)}Mixin = object\\" for cls_tuple in cls_tuples]
+for cls in object_classes:
+    print(cls)
 \\"\\"\\"
 if typing.TYPE_CHECKING:
-    # qty 1 mixin
+    # qty 1
     NoneMixin = NoneClass
     FrozenDictMixin = frozendict.frozendict
     TupleMixin = tuple
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
-    # qty 2 mixin
+    BytesMixin = bytes
+    FileMixin = FileIO
+    # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
     class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
@@ -65824,35 +68334,239 @@ if typing.TYPE_CHECKING:
         pass
     class DecimalBoolMixin(decimal.Decimal, BoolClass):
         pass
+    # qty 3
+    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
+        pass
+    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
+        pass
+    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
+        pass
+    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
+        pass
+    class NoneTupleStrMixin(NoneClass, tuple, str):
+        pass
+    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
+        pass
+    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
+        pass
+    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
+        pass
+    class NoneStrBoolMixin(NoneClass, str, BoolClass):
+        pass
+    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
+        pass
+    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
+        pass
+    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
+        pass
+    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
+        pass
+    class TupleStrBoolMixin(tuple, str, BoolClass):
+        pass
+    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
+        pass
+    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
+        pass
+    # qty 4
+    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
+        pass
+    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
+        pass
+    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
+        pass
+    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
+        pass
+    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
+        pass
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
+        pass
+    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
+        pass
+    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
+        pass
+    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
+        pass
+    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
+        pass
+    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
+        pass
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
-    # qty 1 mixin
-    NoneMixin = object
-    FrozenDictMixin = object
-    TupleMixin = object
-    StrMixin = object
-    DecimalMixin = object
-    BoolMixin = object
-    # qty 2 mixin
-    BinaryMixin = object
-    NoneFrozenDictMixin = object
-    NoneTupleMixin = object
-    NoneStrMixin = object
-    NoneDecimalMixin = object
-    NoneBoolMixin = object
-    FrozenDictTupleMixin = object
-    FrozenDictStrMixin = object
-    FrozenDictDecimalMixin = object
-    FrozenDictBoolMixin = object
-    TupleStrMixin = object
-    TupleDecimalMixin = object
-    TupleBoolMixin = object
-    StrDecimalMixin = object
-    StrBoolMixin = object
-    DecimalBoolMixin = object
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    # qty 1
+    class NoneMixin:
+        _types = {NoneClass}
+    class FrozenDictMixin:
+        _types = {frozendict.frozendict}
+    class TupleMixin:
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
+    # qty 2
+    class BinaryMixin:
+        _types = {bytes, FileIO}
+    class NoneFrozenDictMixin:
+        _types = {NoneClass, frozendict.frozendict}
+    class NoneTupleMixin:
+        _types = {NoneClass, tuple}
+    class NoneStrMixin:
+        _types = {NoneClass, str}
+    class NoneDecimalMixin:
+        _types = {NoneClass, decimal.Decimal}
+    class NoneBoolMixin:
+        _types = {NoneClass, BoolClass}
+    class FrozenDictTupleMixin:
+        _types = {frozendict.frozendict, tuple}
+    class FrozenDictStrMixin:
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
+    # qty 3
+    class NoneFrozenDictTupleMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple}
+    class NoneFrozenDictStrMixin:
+        _types = {NoneClass, frozendict.frozendict, str}
+    class NoneFrozenDictDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
+    class NoneFrozenDictBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
+    class NoneTupleStrMixin:
+        _types = {NoneClass, tuple, str}
+    class NoneTupleDecimalMixin:
+        _types = {NoneClass, tuple, decimal.Decimal}
+    class NoneTupleBoolMixin:
+        _types = {NoneClass, tuple, BoolClass}
+    class NoneStrDecimalMixin:
+        _types = {NoneClass, str, decimal.Decimal}
+    class NoneStrBoolMixin:
+        _types = {NoneClass, str, BoolClass}
+    class NoneDecimalBoolMixin:
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
+    # qty 4
+    class NoneFrozenDictTupleStrMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
+    class NoneFrozenDictTupleDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
+    class NoneFrozenDictTupleBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
+    class NoneFrozenDictStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
+    class NoneFrozenDictStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
+    class NoneFrozenDictDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal}
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
+    # qty 5
+    class NoneFrozenDictTupleStrDecimalMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
+    class NoneFrozenDictTupleStrBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
+    class NoneFrozenDictTupleDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 6
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -65874,7 +68588,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=\\"\\"):
         raise ApiValueError(
             \\"Invalid value \`{value}\`, {constraint_msg} \`{constraint_value}\`{additional_txt} at {path_to_item}\\".format(
                 value=value,
@@ -65886,147 +68600,22 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
+class EnumBase:
     @classmethod
     def _validate_oapg(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Union[typing.Any]) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    \\"\\"\\"
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    \\"\\"\\"
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            \\"\\"\\"Returns a string phrase describing what types are allowed\\"\\"\\"
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return \\"is {0}\\".format(all_class_names[0])
-            return \\"is one of [{0}]\\".format(\\", \\".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            \\"\\"\\"
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            \\"\\"\\"
-            key_or_value = \\"value\\"
-            if key_type:
-                key_or_value = \\"key\\"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = \\"Invalid type. Required {1} type {2} and \\" \\"passed type was {3}\\".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            \\"\\"\\"
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
-class EnumMakerBase:
-    pass
-
-
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
-    class SchemaEnumMaker(EnumMakerBase):
-        @classmethod
-        @property
-        def _enum_value_to_name(
-                cls
-        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-            pass
-            try:
-                super_enum_value_to_name = super()._enum_value_to_name
-            except AttributeError:
-                return enum_value_to_name
-            intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
-            return intersection
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            \\"\\"\\"
-            SchemaEnumMaker _validate_oapg
-            Validates that arg is in the enum's allowed values
-            \\"\\"\\"
-            try:
-                cls._enum_value_to_name[arg]
-            except KeyError:
-                raise ApiValueError(\\"Invalid value {} passed in to {}, {}\\".format(arg, cls, cls._enum_value_to_name))
-            return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-    return SchemaEnumMaker
+        \\"\\"\\"
+        EnumBase _validate_oapg
+        Validates that arg is in the enum's allowed values
+        \\"\\"\\"
+        try:
+            cls.MetaOapg.enum_value_to_name[arg]
+        except KeyError:
+            raise ApiValueError(\\"Invalid value {} passed in to {}, allowed_values={}\\".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class BoolBase:
@@ -66094,7 +68683,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_length,
@@ -66104,7 +68693,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"length must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_length,
@@ -66119,14 +68708,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg=\\"must match regular expression\\",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=\\" with flags=\`{}\`\\".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg=\\"must match regular expression\\",
                         constraint_value=regex_dict['pattern'],
@@ -66148,9 +68737,9 @@ class StrBase(ValidatorBase):
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class UUIDBase(StrBase):
+class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -66214,9 +68803,9 @@ class CustomIsoparser(isoparser):
 DEFAULT_ISOPARSER = CustomIsoparser()
 
 
-class DateBase(StrBase):
+class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -66247,7 +68836,7 @@ class DateBase(StrBase):
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -66276,7 +68865,7 @@ class DateTimeBase:
         return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
-class DecimalBase(StrBase):
+class DecimalBase:
     \\"\\"\\"
     A class for storing decimals that are sent over the wire as strings
     These schemas must remain based on StrBase rather than NumberBase
@@ -66284,7 +68873,7 @@ class DecimalBase(StrBase):
     \\"\\"\\"
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -66342,7 +68931,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -66359,7 +68948,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"value must be a multiple of\\",
                     constraint_value=multiple_of_value,
@@ -66380,7 +68969,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -66390,7 +68979,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value less than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -66400,7 +68989,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than\\",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -66410,7 +68999,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"must be a value greater than or equal to\\",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -66453,6 +69042,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -66462,6 +69052,7 @@ class ListBase(ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if item_validation_metadata.validation_ran_earlier(item_cls):
+                add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = item_cls._validate_oapg(
                 value, validation_metadata=item_validation_metadata)
@@ -66477,7 +69068,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_items,
@@ -66487,7 +69078,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of items must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_items,
@@ -66498,7 +69089,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg=\\"duplicate items were found, and the tuple must not contain duplicates because\\",
                     constraint_value='unique_items==True',
@@ -66586,7 +69177,7 @@ class Discriminable:
         \\"\\"\\"
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -66601,21 +69192,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -66714,9 +69308,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -66724,6 +69316,7 @@ class DictBase(Discriminable, ValidatorBase):
                 validated_path_to_schemas=validation_metadata.validated_path_to_schemas
             )
             if arg_validation_metadata.validation_ran_earlier(schema):
+                add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -66740,7 +69333,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be less than or equal to\\",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -66750,7 +69343,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg=\\"number of properties must be greater than or equal to\\",
                 constraint_value=cls.MetaOapg.min_properties,
@@ -66787,7 +69380,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -66812,6 +69405,7 @@ class DictBase(Discriminable, ValidatorBase):
             validated_path_to_schemas=validation_metadata.validated_path_to_schemas
         )
         if updated_vm.validation_ran_earlier(discriminated_cls):
+            add_deeper_validated_schemas(updated_vm, _path_to_schemas)
             return _path_to_schemas
         other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
         update(_path_to_schemas, other_path_to_schemas)
@@ -66910,18 +69504,11 @@ def cast_to_allowed_types(
     if isinstance(arg, Schema):
         # store the already run validations
         schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            \\"\\"\\"
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            \\"\\"\\"
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
+        for cls in arg.__class__.__bases__:
+            if cls is Singleton:
+                # Skip Singleton
+                continue
+            schema_classes.add(cls)
         validated_path_to_schemas[path_to_item] = schema_classes
 
     type_error = ApiTypeError(f\\"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}\\")
@@ -66972,8 +69559,9 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
             update(path_to_schemas, other_path_to_schemas)
@@ -66988,12 +69576,13 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
             if validation_metadata.validation_ran_earlier(oneof_cls):
                 oneof_classes.append(oneof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -67012,6 +69601,7 @@ class ComposedBase(Discriminable):
                 \\"Invalid inputs given to generate an instance of {}. Multiple \\"
                 \\"oneOf schemas {} matched the inputs, but a max of one is allowed.\\".format(cls, oneof_classes)
             )
+        # exactly one class matches
         return path_to_schemas
 
     @classmethod
@@ -67023,9 +69613,10 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
+                add_deeper_validated_schemas(validation_metadata, path_to_schemas)
                 continue
 
             try:
@@ -67076,7 +69667,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]
@@ -67113,8 +69706,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -67136,13 +69730,13 @@ class ComposedBase(Discriminable):
 
         if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
             # TODO use an exception from this package here
+            add_deeper_validated_schemas(updated_vm, path_to_schemas)
             assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
         return path_to_schemas
 
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -67163,7 +69757,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[tuple]),
     ListBase,
     Schema,
     TupleMixin
@@ -67173,12 +69766,11 @@ class ListSchema(
     def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass]),
     NoneBase,
     Schema,
     NoneMixin
@@ -67188,12 +69780,11 @@ class NoneSchema(
     def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: None, **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema,
     DecimalMixin
@@ -67204,14 +69795,14 @@ class NumberSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
-class IntBase(NumberBase):
+class IntBase:
     @property
     def as_int_oapg(self) -> int:
         try:
@@ -67250,15 +69841,33 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class Int32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-2147483648)
-        inclusive_maximum = decimal.Decimal(2147483647)
+    __inclusive_minimum = decimal.Decimal(-2147483648)
+    __inclusive_maximum = decimal.Decimal(2147483647)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int32 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int32Schema(
@@ -67269,10 +69878,28 @@ class Int32Schema(
 
 
 class Int64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-9223372036854775808)
-        inclusive_maximum = decimal.Decimal(9223372036854775807)
+    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
+    __inclusive_maximum = decimal.Decimal(9223372036854775807)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type int64 at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Int64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Int64Schema(
@@ -67283,10 +69910,28 @@ class Int64Schema(
 
 
 class Float32Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-        inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
+    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
+
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type float at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float32Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 
 class Float32Schema(
@@ -67295,17 +69940,33 @@ class Float32Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
-        # todo check format
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class Float64Base:
-    # TODO make this run even if the inheriting class defines these
-    class MetaOapg:
-        inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-        inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
+    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
+    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
 
+    @classmethod
+    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
+        if isinstance(arg, decimal.Decimal):
+            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
+                raise ApiValueError(
+                    \\"Invalid value '{}' for type double at {}\\".format(arg, validation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate_oapg(
+        cls,
+        arg,
+        validation_metadata: ValidationMetadata,
+    ):
+        \\"\\"\\"
+        Float64Base _validate_oapg
+        \\"\\"\\"
+        cls.__validate_format(arg, validation_metadata=validation_metadata)
+        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
 class Float64Schema(
     Float64Base,
@@ -67313,13 +69974,12 @@ class Float64Schema(
 ):
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
         # todo check format
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[str]),
     StrBase,
     Schema,
     StrMixin
@@ -67332,34 +69992,34 @@ class StrSchema(
     \\"\\"\\"
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, date], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
 
-    def __new__(cls, arg: typing.Union[str], **kwargs: Configuration):
+    def __new__(cls, _arg: str, **kwargs: Configuration):
         \\"\\"\\"
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -67368,23 +70028,23 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         \\"\\"\\"
-        return super().__new__(cls, arg, **kwargs)
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes]),
     Schema,
+    BytesMixin
 ):
     \\"\\"\\"
     this class will subclass bytes and is immutable
     \\"\\"\\"
-    def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: bytes, **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[FileIO]),
     Schema,
+    FileMixin
 ):
     \\"\\"\\"
     This class is NOT immutable
@@ -67403,8 +70063,8 @@ class FileSchema(
     - to be able to preserve file name info
     \\"\\"\\"
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
+        return super(Schema, cls).__new__(cls, _arg)
 
 
 class BinaryBase:
@@ -67412,24 +70072,24 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
+        return super().__new__(cls, _arg)
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[BoolClass]),
     BoolBase,
     Schema,
     BoolMixin
@@ -67439,14 +70099,11 @@ class BoolSchema(
     def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
+    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, _arg, **kwargs)
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -67454,7 +70111,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -67479,18 +70136,17 @@ class NotAnyTypeSchema(
 
     def __new__(
         cls,
-        *args,
+        *_args,
         _configuration: typing.Optional[Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *args,
+            *_args,
             _configuration=_configuration,
         )
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
     Schema,
     FrozenDictMixin
@@ -67499,14 +70155,14 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    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 __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)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
@@ -67523,12 +70179,12 @@ LOG_CACHE_USAGE = False
 
 def log_cache_usage(cache_fn):
     if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
-",
+        print(cache_fn.__name__, cache_fn.cache_info())",
   "generated/python/tox.ini": "[tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
@@ -67605,7 +70261,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -68189,11 +70845,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -68209,7 +70867,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -68234,7 +70892,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -68553,6 +71211,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -68611,6 +71279,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -68759,16 +71437,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -68792,22 +71470,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -68823,7 +71501,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -68850,22 +71550,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -68885,10 +71592,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -68915,7 +71622,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -68952,7 +71659,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -68968,9 +71675,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {
diff --git a/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/with-smithy-build-options.test.ts.snap b/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/with-smithy-build-options.test.ts.snap
index f35f174ac..d0273ff95 100644
--- a/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/with-smithy-build-options.test.ts.snap
+++ b/packages/open-api-gateway/test/project/smithy-api-gateway-ts-project/__snapshots__/with-smithy-build-options.test.ts.snap
@@ -1795,7 +1795,7 @@ src/models/SayHelloResponseContent.ts
 src/models/index.ts
 src/runtime.ts
 ",
-  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.0.0",
+  "packages/api/generated/typescript/.openapi-generator/VERSION": "6.3.0",
   "packages/api/generated/typescript/.projen/deps.json": Object {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \\"npx projen\\".",
     "dependencies": Array [
@@ -2379,11 +2379,13 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 
 
 import * as runtime from '../runtime';
+import type {
+  ApiErrorResponseContent,
+  SayHelloResponseContent,
+} from '../models';
 import {
-    ApiErrorResponseContent,
     ApiErrorResponseContentFromJSON,
     ApiErrorResponseContentToJSON,
-    SayHelloResponseContent,
     SayHelloResponseContentFromJSON,
     SayHelloResponseContentToJSON,
 } from '../models';
@@ -2399,7 +2401,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
+    async sayHelloRaw(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SayHelloResponseContent>> {
         if (requestParameters.name === null || requestParameters.name === undefined) {
             throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling sayHello.');
         }
@@ -2424,7 +2426,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<SayHelloResponseContent> {
+    async sayHello(requestParameters: SayHelloRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SayHelloResponseContent> {
         const response = await this.sayHelloRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -2743,6 +2745,16 @@ export interface ApiErrorResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the ApiErrorResponseContent interface.
+ */
+export function instanceOfApiErrorResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"errorMessage\\" in value;
+
+    return isInstance;
+}
+
 export function ApiErrorResponseContentFromJSON(json: any): ApiErrorResponseContent {
     return ApiErrorResponseContentFromJSONTyped(json, false);
 }
@@ -2801,6 +2813,16 @@ export interface SayHelloResponseContent {
 }
 
 
+/**
+ * Check if a given object implements the SayHelloResponseContent interface.
+ */
+export function instanceOfSayHelloResponseContent(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && \\"message\\" in value;
+
+    return isInstance;
+}
+
 export function SayHelloResponseContentFromJSON(json: any): SayHelloResponseContent {
     return SayHelloResponseContentFromJSONTyped(json, false);
 }
@@ -2949,16 +2971,16 @@ export class BaseAPI {
         return this.withMiddleware<T>(...middlewares);
     }
 
-    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction): Promise<Response> {
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
         const { url, init } = await this.createFetchParams(context, initOverrides);
         const response = await this.fetchApi(url, init);
-        if (response.status >= 200 && response.status < 300) {
+        if (response && (response.status >= 200 && response.status < 300)) {
             return response;
         }
         throw new ResponseError(response, 'Response returned an error code');
     }
 
-    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverideFunction) {
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
         let url = this.configuration.basePath + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
             // only add the querystring to the URL if there are query parameters.
@@ -2982,22 +3004,22 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
                 context,
             }))
-        }
+        };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
@@ -3013,7 +3035,29 @@ export class BaseAPI {
                 }) || fetchParams;
             }
         }
-        let response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
         for (const middleware of this.middleware) {
             if (middleware.post) {
                 response = await middleware.post({
@@ -3040,22 +3084,29 @@ export class BaseAPI {
 };
 
 function isBlob(value: any): value is Blob {
-    return typeof Blob !== 'undefined' && value instanceof Blob
+    return typeof Blob !== 'undefined' && value instanceof Blob;
 }
 
 function isFormData(value: any): value is FormData {
-    return typeof FormData !== \\"undefined\\" && value instanceof FormData
+    return typeof FormData !== \\"undefined\\" && value instanceof FormData;
 }
 
 export class ResponseError extends Error {
-    name: \\"ResponseError\\" = \\"ResponseError\\";
+    override name: \\"ResponseError\\" = \\"ResponseError\\";
     constructor(public response: Response, msg?: string) {
         super(msg);
     }
 }
 
+export class FetchError extends Error {
+    override name: \\"FetchError\\" = \\"FetchError\\";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
 export class RequiredError extends Error {
-    name: \\"RequiredError\\" = \\"RequiredError\\";
+    override name: \\"RequiredError\\" = \\"RequiredError\\";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -3075,10 +3126,10 @@ export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;
-export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody }
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export type InitOverideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
 
 export interface FetchParams {
     url: string;
@@ -3105,7 +3156,7 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
         .join('&');
 }
 
-function querystringSingleKey(key: string, value: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
     const fullKey = keyPrefix + (keyPrefix.length ? \`[\${key}]\` : key);
     if (value instanceof Array) {
         const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
@@ -3142,7 +3193,7 @@ export function canConsumeForm(consumes: Consume[]): boolean {
 }
 
 export interface Consume {
-    contentType: string
+    contentType: string;
 }
 
 export interface RequestContext {
@@ -3158,9 +3209,18 @@ export interface ResponseContext {
     response: Response;
 }
 
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
 export interface Middleware {
     pre?(context: RequestContext): Promise<FetchParams | void>;
     post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
 }
 
 export interface ApiResponse<T> {