From 5f63385a3128103c8e08897cce5810e4e5a7bac3 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 20 May 2025 16:25:11 +0800 Subject: [PATCH] Provide " as member" where needed (#21304) * fix: #20878 Provide " as member" where needed - Generate new samples - Add tests for all effected python versions - Ran tests with success Commands used to verify: ./bin/generate-samples.sh ./bin/configs/python* mvn verify -Psamples mvn integration-test -f modules/openapi-generator/pom.xml -Dtest=org.openapitools.codegen.python.PythonPydanticV1ClientCodegenTest -e mvn integration-test -f modules/openapi-generator/pom.xml -Dtest=org.openapitools.codegen.python.PythonClientCodegenTest -e * remove 3.8 tests * use localhost * update tests * update test --------- Co-authored-by: Robert Plummer --- .../samples-python-pydantic-v1-petstore.yaml | 1 - .../__init__package.mustache | 24 +- .../resources/python/__init__package.mustache | 24 +- .../python/PythonClientCodegenTest.java | 44 +++ .../PythonPydanticV1ClientCodegenTest.java | 31 +++ ...ith-fake-endpoints-models-for-testing.yaml | 1 + .../openapi_client/__init__.py | 54 ++-- .../openapi_client/__init__.py | 54 ++-- .../python/openapi_client/__init__.py | 54 ++-- .../python-aiohttp/petstore_api/__init__.py | 252 +++++++++--------- .../petstore_api/api/user_api.py | 7 +- .../python-aiohttp/tests/test_api_client.py | 2 +- .../petstore_api/__init__.py | 252 +++++++++--------- .../petstore_api/api/user_api.py | 1 + .../petstore_api/__init__.py | 252 +++++++++--------- .../petstore_api/api/user_api.py | 1 + .../petstore/python/petstore_api/__init__.py | 252 +++++++++--------- .../python/petstore_api/api/user_api.py | 7 +- .../petstore/python/tests/test_api_client.py | 2 +- 19 files changed, 697 insertions(+), 618 deletions(-) diff --git a/.github/workflows/samples-python-pydantic-v1-petstore.yaml b/.github/workflows/samples-python-pydantic-v1-petstore.yaml index 663df4ce1f36..e06934dedfe2 100644 --- a/.github/workflows/samples-python-pydantic-v1-petstore.yaml +++ b/.github/workflows/samples-python-pydantic-v1-petstore.yaml @@ -15,7 +15,6 @@ jobs: fail-fast: false matrix: python-version: - - "3.8" - "3.9" - "3.10" - "3.11" diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__package.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__package.mustache index b6105807797d..48c23c3578c7 100644 --- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__package.mustache +++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__package.mustache @@ -24,26 +24,26 @@ __all__ = [ ] # import apis into sdk package -{{#apiInfo}}{{#apis}}from {{apiPackage}}.{{classFilename}} import {{classname}} +{{#apiInfo}}{{#apis}}from {{apiPackage}}.{{classFilename}} import {{classname}} as {{classname}} {{/apis}}{{/apiInfo}} # import ApiClient -from {{packageName}}.api_response import ApiResponse -from {{packageName}}.api_client import ApiClient -from {{packageName}}.configuration import Configuration -from {{packageName}}.exceptions import OpenApiException -from {{packageName}}.exceptions import ApiTypeError -from {{packageName}}.exceptions import ApiValueError -from {{packageName}}.exceptions import ApiKeyError -from {{packageName}}.exceptions import ApiAttributeError -from {{packageName}}.exceptions import ApiException +from {{packageName}}.api_response import ApiResponse as ApiResponse +from {{packageName}}.api_client import ApiClient as ApiClient +from {{packageName}}.configuration import Configuration as Configuration +from {{packageName}}.exceptions import OpenApiException as OpenApiException +from {{packageName}}.exceptions import ApiTypeError as ApiTypeError +from {{packageName}}.exceptions import ApiValueError as ApiValueError +from {{packageName}}.exceptions import ApiKeyError as ApiKeyError +from {{packageName}}.exceptions import ApiAttributeError as ApiAttributeError +from {{packageName}}.exceptions import ApiException as ApiException {{#hasHttpSignatureMethods}} -from {{packageName}}.signing import HttpSigningConfiguration +from {{packageName}}.signing import HttpSigningConfiguration as HttpSigningConfiguration {{/hasHttpSignatureMethods}} # import models into sdk package {{#models}} {{#model}} -from {{modelPackage}}.{{classFilename}} import {{classname}} +from {{modelPackage}}.{{classFilename}} import {{classname}} as {{classname}} {{/model}} {{/models}} {{#recursionLimit}} diff --git a/modules/openapi-generator/src/main/resources/python/__init__package.mustache b/modules/openapi-generator/src/main/resources/python/__init__package.mustache index b6105807797d..48c23c3578c7 100644 --- a/modules/openapi-generator/src/main/resources/python/__init__package.mustache +++ b/modules/openapi-generator/src/main/resources/python/__init__package.mustache @@ -24,26 +24,26 @@ __all__ = [ ] # import apis into sdk package -{{#apiInfo}}{{#apis}}from {{apiPackage}}.{{classFilename}} import {{classname}} +{{#apiInfo}}{{#apis}}from {{apiPackage}}.{{classFilename}} import {{classname}} as {{classname}} {{/apis}}{{/apiInfo}} # import ApiClient -from {{packageName}}.api_response import ApiResponse -from {{packageName}}.api_client import ApiClient -from {{packageName}}.configuration import Configuration -from {{packageName}}.exceptions import OpenApiException -from {{packageName}}.exceptions import ApiTypeError -from {{packageName}}.exceptions import ApiValueError -from {{packageName}}.exceptions import ApiKeyError -from {{packageName}}.exceptions import ApiAttributeError -from {{packageName}}.exceptions import ApiException +from {{packageName}}.api_response import ApiResponse as ApiResponse +from {{packageName}}.api_client import ApiClient as ApiClient +from {{packageName}}.configuration import Configuration as Configuration +from {{packageName}}.exceptions import OpenApiException as OpenApiException +from {{packageName}}.exceptions import ApiTypeError as ApiTypeError +from {{packageName}}.exceptions import ApiValueError as ApiValueError +from {{packageName}}.exceptions import ApiKeyError as ApiKeyError +from {{packageName}}.exceptions import ApiAttributeError as ApiAttributeError +from {{packageName}}.exceptions import ApiException as ApiException {{#hasHttpSignatureMethods}} -from {{packageName}}.signing import HttpSigningConfiguration +from {{packageName}}.signing import HttpSigningConfiguration as HttpSigningConfiguration {{/hasHttpSignatureMethods}} # import models into sdk package {{#models}} {{#model}} -from {{modelPackage}}.{{classFilename}} import {{classname}} +from {{modelPackage}}.{{classFilename}} import {{classname}} as {{classname}} {{/model}} {{/models}} {{#recursionLimit}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java index 853f86086ec8..0735ccc4f6f7 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java @@ -567,4 +567,48 @@ public class PythonClientCodegenTest { assertNotNull(setupFile); assertFileContains(setupFile.toPath(), "setup("); } + + @Test(description = "outputs __init__.py with imports for exports") + public void testInitFileImportsExports() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml"); + final DefaultGenerator defaultGenerator = new DefaultGenerator(); + final ClientOptInput clientOptInput = new ClientOptInput(); + clientOptInput.openAPI(openAPI); + PythonClientCodegen pythonClientCodegen = new PythonClientCodegen(); + pythonClientCodegen.setOutputDir(output.getAbsolutePath()); + clientOptInput.config(pythonClientCodegen); + defaultGenerator.opts(clientOptInput); + + Map files = defaultGenerator.generate().stream().collect(Collectors.toMap(File::getPath, Function.identity())); + + File initFile = files.get(Paths.get(output.getAbsolutePath(), "openapi_client", "__init__.py").toString()); + assertNotNull(initFile); + Path initFilePath = initFile.toPath(); + + // import apis into sdk package + assertFileContains(initFilePath, "from openapi_client.api.pet_api import PetApi as PetApi"); + assertFileContains(initFilePath, "from openapi_client.api.store_api import StoreApi as StoreApi"); + assertFileContains(initFilePath, "from openapi_client.api.user_api import UserApi as UserApi"); + + // import ApiClient + assertFileContains(initFilePath, "from openapi_client.api_response import ApiResponse as ApiResponse"); + assertFileContains(initFilePath, "from openapi_client.api_client import ApiClient as ApiClient"); + assertFileContains(initFilePath, "from openapi_client.configuration import Configuration as Configuration"); + assertFileContains(initFilePath, "from openapi_client.exceptions import OpenApiException as OpenApiException"); + assertFileContains(initFilePath, "from openapi_client.exceptions import ApiTypeError as ApiTypeError"); + assertFileContains(initFilePath, "from openapi_client.exceptions import ApiValueError as ApiValueError"); + assertFileContains(initFilePath, "from openapi_client.exceptions import ApiKeyError as ApiKeyError"); + assertFileContains(initFilePath, "from openapi_client.exceptions import ApiAttributeError as ApiAttributeError"); + assertFileContains(initFilePath, "from openapi_client.exceptions import ApiException as ApiException"); + + // import models into sdk package + assertFileContains(initFilePath, "from openapi_client.models.api_response import ApiResponse as ApiResponse"); + assertFileContains(initFilePath, "from openapi_client.models.category import Category as Category"); + assertFileContains(initFilePath, "from openapi_client.models.order import Order as Order"); + assertFileContains(initFilePath, "from openapi_client.models.pet import Pet as Pet"); + assertFileContains(initFilePath, "from openapi_client.models.tag import Tag as Tag"); + assertFileContains(initFilePath, "from openapi_client.models.user import User as User"); + } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonPydanticV1ClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonPydanticV1ClientCodegenTest.java index fe22b8cc929f..1c2fd629ce3b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonPydanticV1ClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonPydanticV1ClientCodegenTest.java @@ -503,4 +503,35 @@ public class PythonPydanticV1ClientCodegenTest { CodegenProperty property = vars.get(0); Assert.assertEquals(property.name, "dollar_value"); } + + @Test(description = "outputs __init__.py with imports for exports") + public void testInitFileImportsExports() throws Exception { + final PythonPydanticV1ClientCodegen codegen = new PythonPydanticV1ClientCodegen(); + final String outputPath = generateFiles(codegen, "src/test/resources/3_0/petstore.yaml"); + final Path initFilePath = Paths.get(outputPath + "openapi_client/__init__.py"); + + // import apis into sdk package + assertFileContains(initFilePath, "from openapi_client.api.pet_api import PetApi as PetApi"); + assertFileContains(initFilePath, "from openapi_client.api.store_api import StoreApi as StoreApi"); + assertFileContains(initFilePath, "from openapi_client.api.user_api import UserApi as UserApi"); + + // import ApiClient + assertFileContains(initFilePath, "from openapi_client.api_response import ApiResponse as ApiResponse"); + assertFileContains(initFilePath, "from openapi_client.api_client import ApiClient as ApiClient"); + assertFileContains(initFilePath, "from openapi_client.configuration import Configuration as Configuration"); + assertFileContains(initFilePath, "from openapi_client.exceptions import OpenApiException as OpenApiException"); + assertFileContains(initFilePath, "from openapi_client.exceptions import ApiTypeError as ApiTypeError"); + assertFileContains(initFilePath, "from openapi_client.exceptions import ApiValueError as ApiValueError"); + assertFileContains(initFilePath, "from openapi_client.exceptions import ApiKeyError as ApiKeyError"); + assertFileContains(initFilePath, "from openapi_client.exceptions import ApiAttributeError as ApiAttributeError"); + assertFileContains(initFilePath, "from openapi_client.exceptions import ApiException as ApiException"); + + // import models into sdk package + assertFileContains(initFilePath, "from openapi_client.models.api_response import ApiResponse as ApiResponse"); + assertFileContains(initFilePath, "from openapi_client.models.category import Category as Category"); + assertFileContains(initFilePath, "from openapi_client.models.order import Order as Order"); + assertFileContains(initFilePath, "from openapi_client.models.pet import Pet as Pet"); + assertFileContains(initFilePath, "from openapi_client.models.tag import Tag as Tag"); + assertFileContains(initFilePath, "from openapi_client.models.user import User as User"); + } } diff --git a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml index 98f1b1246048..91d4133352e3 100644 --- a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml @@ -397,6 +397,7 @@ paths: description: Order not found /user: servers: + - url: 'http://localhost/v2' - url: 'http://petstore.swagger.io/v2' - url: 'http://path-server-test.petstore.local/v2' - url: 'http://{server}.swagger.io:{port}/v2' diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/__init__.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/__init__.py index 1203d0f4afb2..5da36103dcbb 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/__init__.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/__init__.py @@ -49,34 +49,34 @@ __all__ = [ ] # import apis into sdk package -from openapi_client.api.auth_api import AuthApi -from openapi_client.api.body_api import BodyApi -from openapi_client.api.form_api import FormApi -from openapi_client.api.header_api import HeaderApi -from openapi_client.api.path_api import PathApi -from openapi_client.api.query_api import QueryApi +from openapi_client.api.auth_api import AuthApi as AuthApi +from openapi_client.api.body_api import BodyApi as BodyApi +from openapi_client.api.form_api import FormApi as FormApi +from openapi_client.api.header_api import HeaderApi as HeaderApi +from openapi_client.api.path_api import PathApi as PathApi +from openapi_client.api.query_api import QueryApi as QueryApi # import ApiClient -from openapi_client.api_response import ApiResponse -from openapi_client.api_client import ApiClient -from openapi_client.configuration import Configuration -from openapi_client.exceptions import OpenApiException -from openapi_client.exceptions import ApiTypeError -from openapi_client.exceptions import ApiValueError -from openapi_client.exceptions import ApiKeyError -from openapi_client.exceptions import ApiAttributeError -from openapi_client.exceptions import ApiException +from openapi_client.api_response import ApiResponse as ApiResponse +from openapi_client.api_client import ApiClient as ApiClient +from openapi_client.configuration import Configuration as Configuration +from openapi_client.exceptions import OpenApiException as OpenApiException +from openapi_client.exceptions import ApiTypeError as ApiTypeError +from openapi_client.exceptions import ApiValueError as ApiValueError +from openapi_client.exceptions import ApiKeyError as ApiKeyError +from openapi_client.exceptions import ApiAttributeError as ApiAttributeError +from openapi_client.exceptions import ApiException as ApiException # import models into sdk package -from openapi_client.models.bird import Bird -from openapi_client.models.category import Category -from openapi_client.models.data_query import DataQuery -from openapi_client.models.default_value import DefaultValue -from openapi_client.models.number_properties_only import NumberPropertiesOnly -from openapi_client.models.pet import Pet -from openapi_client.models.query import Query -from openapi_client.models.string_enum_ref import StringEnumRef -from openapi_client.models.tag import Tag -from openapi_client.models.test_form_object_multipart_request_marker import TestFormObjectMultipartRequestMarker -from openapi_client.models.test_query_style_deep_object_explode_true_object_all_of_query_object_parameter import TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter -from openapi_client.models.test_query_style_form_explode_true_array_string_query_object_parameter import TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter +from openapi_client.models.bird import Bird as Bird +from openapi_client.models.category import Category as Category +from openapi_client.models.data_query import DataQuery as DataQuery +from openapi_client.models.default_value import DefaultValue as DefaultValue +from openapi_client.models.number_properties_only import NumberPropertiesOnly as NumberPropertiesOnly +from openapi_client.models.pet import Pet as Pet +from openapi_client.models.query import Query as Query +from openapi_client.models.string_enum_ref import StringEnumRef as StringEnumRef +from openapi_client.models.tag import Tag as Tag +from openapi_client.models.test_form_object_multipart_request_marker import TestFormObjectMultipartRequestMarker as TestFormObjectMultipartRequestMarker +from openapi_client.models.test_query_style_deep_object_explode_true_object_all_of_query_object_parameter import TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter as TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter +from openapi_client.models.test_query_style_form_explode_true_array_string_query_object_parameter import TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter as TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter diff --git a/samples/client/echo_api/python-pydantic-v1/openapi_client/__init__.py b/samples/client/echo_api/python-pydantic-v1/openapi_client/__init__.py index 1203d0f4afb2..5da36103dcbb 100644 --- a/samples/client/echo_api/python-pydantic-v1/openapi_client/__init__.py +++ b/samples/client/echo_api/python-pydantic-v1/openapi_client/__init__.py @@ -49,34 +49,34 @@ __all__ = [ ] # import apis into sdk package -from openapi_client.api.auth_api import AuthApi -from openapi_client.api.body_api import BodyApi -from openapi_client.api.form_api import FormApi -from openapi_client.api.header_api import HeaderApi -from openapi_client.api.path_api import PathApi -from openapi_client.api.query_api import QueryApi +from openapi_client.api.auth_api import AuthApi as AuthApi +from openapi_client.api.body_api import BodyApi as BodyApi +from openapi_client.api.form_api import FormApi as FormApi +from openapi_client.api.header_api import HeaderApi as HeaderApi +from openapi_client.api.path_api import PathApi as PathApi +from openapi_client.api.query_api import QueryApi as QueryApi # import ApiClient -from openapi_client.api_response import ApiResponse -from openapi_client.api_client import ApiClient -from openapi_client.configuration import Configuration -from openapi_client.exceptions import OpenApiException -from openapi_client.exceptions import ApiTypeError -from openapi_client.exceptions import ApiValueError -from openapi_client.exceptions import ApiKeyError -from openapi_client.exceptions import ApiAttributeError -from openapi_client.exceptions import ApiException +from openapi_client.api_response import ApiResponse as ApiResponse +from openapi_client.api_client import ApiClient as ApiClient +from openapi_client.configuration import Configuration as Configuration +from openapi_client.exceptions import OpenApiException as OpenApiException +from openapi_client.exceptions import ApiTypeError as ApiTypeError +from openapi_client.exceptions import ApiValueError as ApiValueError +from openapi_client.exceptions import ApiKeyError as ApiKeyError +from openapi_client.exceptions import ApiAttributeError as ApiAttributeError +from openapi_client.exceptions import ApiException as ApiException # import models into sdk package -from openapi_client.models.bird import Bird -from openapi_client.models.category import Category -from openapi_client.models.data_query import DataQuery -from openapi_client.models.default_value import DefaultValue -from openapi_client.models.number_properties_only import NumberPropertiesOnly -from openapi_client.models.pet import Pet -from openapi_client.models.query import Query -from openapi_client.models.string_enum_ref import StringEnumRef -from openapi_client.models.tag import Tag -from openapi_client.models.test_form_object_multipart_request_marker import TestFormObjectMultipartRequestMarker -from openapi_client.models.test_query_style_deep_object_explode_true_object_all_of_query_object_parameter import TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter -from openapi_client.models.test_query_style_form_explode_true_array_string_query_object_parameter import TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter +from openapi_client.models.bird import Bird as Bird +from openapi_client.models.category import Category as Category +from openapi_client.models.data_query import DataQuery as DataQuery +from openapi_client.models.default_value import DefaultValue as DefaultValue +from openapi_client.models.number_properties_only import NumberPropertiesOnly as NumberPropertiesOnly +from openapi_client.models.pet import Pet as Pet +from openapi_client.models.query import Query as Query +from openapi_client.models.string_enum_ref import StringEnumRef as StringEnumRef +from openapi_client.models.tag import Tag as Tag +from openapi_client.models.test_form_object_multipart_request_marker import TestFormObjectMultipartRequestMarker as TestFormObjectMultipartRequestMarker +from openapi_client.models.test_query_style_deep_object_explode_true_object_all_of_query_object_parameter import TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter as TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter +from openapi_client.models.test_query_style_form_explode_true_array_string_query_object_parameter import TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter as TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter diff --git a/samples/client/echo_api/python/openapi_client/__init__.py b/samples/client/echo_api/python/openapi_client/__init__.py index 1203d0f4afb2..5da36103dcbb 100644 --- a/samples/client/echo_api/python/openapi_client/__init__.py +++ b/samples/client/echo_api/python/openapi_client/__init__.py @@ -49,34 +49,34 @@ __all__ = [ ] # import apis into sdk package -from openapi_client.api.auth_api import AuthApi -from openapi_client.api.body_api import BodyApi -from openapi_client.api.form_api import FormApi -from openapi_client.api.header_api import HeaderApi -from openapi_client.api.path_api import PathApi -from openapi_client.api.query_api import QueryApi +from openapi_client.api.auth_api import AuthApi as AuthApi +from openapi_client.api.body_api import BodyApi as BodyApi +from openapi_client.api.form_api import FormApi as FormApi +from openapi_client.api.header_api import HeaderApi as HeaderApi +from openapi_client.api.path_api import PathApi as PathApi +from openapi_client.api.query_api import QueryApi as QueryApi # import ApiClient -from openapi_client.api_response import ApiResponse -from openapi_client.api_client import ApiClient -from openapi_client.configuration import Configuration -from openapi_client.exceptions import OpenApiException -from openapi_client.exceptions import ApiTypeError -from openapi_client.exceptions import ApiValueError -from openapi_client.exceptions import ApiKeyError -from openapi_client.exceptions import ApiAttributeError -from openapi_client.exceptions import ApiException +from openapi_client.api_response import ApiResponse as ApiResponse +from openapi_client.api_client import ApiClient as ApiClient +from openapi_client.configuration import Configuration as Configuration +from openapi_client.exceptions import OpenApiException as OpenApiException +from openapi_client.exceptions import ApiTypeError as ApiTypeError +from openapi_client.exceptions import ApiValueError as ApiValueError +from openapi_client.exceptions import ApiKeyError as ApiKeyError +from openapi_client.exceptions import ApiAttributeError as ApiAttributeError +from openapi_client.exceptions import ApiException as ApiException # import models into sdk package -from openapi_client.models.bird import Bird -from openapi_client.models.category import Category -from openapi_client.models.data_query import DataQuery -from openapi_client.models.default_value import DefaultValue -from openapi_client.models.number_properties_only import NumberPropertiesOnly -from openapi_client.models.pet import Pet -from openapi_client.models.query import Query -from openapi_client.models.string_enum_ref import StringEnumRef -from openapi_client.models.tag import Tag -from openapi_client.models.test_form_object_multipart_request_marker import TestFormObjectMultipartRequestMarker -from openapi_client.models.test_query_style_deep_object_explode_true_object_all_of_query_object_parameter import TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter -from openapi_client.models.test_query_style_form_explode_true_array_string_query_object_parameter import TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter +from openapi_client.models.bird import Bird as Bird +from openapi_client.models.category import Category as Category +from openapi_client.models.data_query import DataQuery as DataQuery +from openapi_client.models.default_value import DefaultValue as DefaultValue +from openapi_client.models.number_properties_only import NumberPropertiesOnly as NumberPropertiesOnly +from openapi_client.models.pet import Pet as Pet +from openapi_client.models.query import Query as Query +from openapi_client.models.string_enum_ref import StringEnumRef as StringEnumRef +from openapi_client.models.tag import Tag as Tag +from openapi_client.models.test_form_object_multipart_request_marker import TestFormObjectMultipartRequestMarker as TestFormObjectMultipartRequestMarker +from openapi_client.models.test_query_style_deep_object_explode_true_object_all_of_query_object_parameter import TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter as TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter +from openapi_client.models.test_query_style_form_explode_true_array_string_query_object_parameter import TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter as TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py index 3c1abd3c2ee7..50788f3e21c0 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py @@ -147,133 +147,133 @@ __all__ = [ ] # import apis into sdk package -from petstore_api.api.another_fake_api import AnotherFakeApi -from petstore_api.api.default_api import DefaultApi -from petstore_api.api.fake_api import FakeApi -from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api -from petstore_api.api.import_test_datetime_api import ImportTestDatetimeApi -from petstore_api.api.pet_api import PetApi -from petstore_api.api.store_api import StoreApi -from petstore_api.api.user_api import UserApi +from petstore_api.api.another_fake_api import AnotherFakeApi as AnotherFakeApi +from petstore_api.api.default_api import DefaultApi as DefaultApi +from petstore_api.api.fake_api import FakeApi as FakeApi +from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api as FakeClassnameTags123Api +from petstore_api.api.import_test_datetime_api import ImportTestDatetimeApi as ImportTestDatetimeApi +from petstore_api.api.pet_api import PetApi as PetApi +from petstore_api.api.store_api import StoreApi as StoreApi +from petstore_api.api.user_api import UserApi as UserApi # import ApiClient -from petstore_api.api_response import ApiResponse -from petstore_api.api_client import ApiClient -from petstore_api.configuration import Configuration -from petstore_api.exceptions import OpenApiException -from petstore_api.exceptions import ApiTypeError -from petstore_api.exceptions import ApiValueError -from petstore_api.exceptions import ApiKeyError -from petstore_api.exceptions import ApiAttributeError -from petstore_api.exceptions import ApiException -from petstore_api.signing import HttpSigningConfiguration +from petstore_api.api_response import ApiResponse as ApiResponse +from petstore_api.api_client import ApiClient as ApiClient +from petstore_api.configuration import Configuration as Configuration +from petstore_api.exceptions import OpenApiException as OpenApiException +from petstore_api.exceptions import ApiTypeError as ApiTypeError +from petstore_api.exceptions import ApiValueError as ApiValueError +from petstore_api.exceptions import ApiKeyError as ApiKeyError +from petstore_api.exceptions import ApiAttributeError as ApiAttributeError +from petstore_api.exceptions import ApiException as ApiException +from petstore_api.signing import HttpSigningConfiguration as HttpSigningConfiguration # import models into sdk package -from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType -from petstore_api.models.additional_properties_class import AdditionalPropertiesClass -from petstore_api.models.additional_properties_object import AdditionalPropertiesObject -from petstore_api.models.additional_properties_with_description_only import AdditionalPropertiesWithDescriptionOnly -from petstore_api.models.all_of_super_model import AllOfSuperModel -from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef -from petstore_api.models.animal import Animal -from petstore_api.models.any_of_color import AnyOfColor -from petstore_api.models.any_of_pig import AnyOfPig -from petstore_api.models.array_of_array_of_model import ArrayOfArrayOfModel -from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly -from petstore_api.models.array_of_number_only import ArrayOfNumberOnly -from petstore_api.models.array_test import ArrayTest -from petstore_api.models.base_discriminator import BaseDiscriminator -from petstore_api.models.basque_pig import BasquePig -from petstore_api.models.bathing import Bathing -from petstore_api.models.capitalization import Capitalization -from petstore_api.models.cat import Cat -from petstore_api.models.category import Category -from petstore_api.models.circular_all_of_ref import CircularAllOfRef -from petstore_api.models.circular_reference_model import CircularReferenceModel -from petstore_api.models.class_model import ClassModel -from petstore_api.models.client import Client -from petstore_api.models.color import Color -from petstore_api.models.creature import Creature -from petstore_api.models.creature_info import CreatureInfo -from petstore_api.models.danish_pig import DanishPig -from petstore_api.models.deprecated_object import DeprecatedObject -from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub -from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from petstore_api.models.dog import Dog -from petstore_api.models.dummy_model import DummyModel -from petstore_api.models.enum_arrays import EnumArrays -from petstore_api.models.enum_class import EnumClass -from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt -from petstore_api.models.enum_string1 import EnumString1 -from petstore_api.models.enum_string2 import EnumString2 -from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt -from petstore_api.models.enum_test import EnumTest -from petstore_api.models.feeding import Feeding -from petstore_api.models.file import File -from petstore_api.models.file_schema_test_class import FileSchemaTestClass -from petstore_api.models.first_ref import FirstRef -from petstore_api.models.foo import Foo -from petstore_api.models.foo_get_default_response import FooGetDefaultResponse -from petstore_api.models.format_test import FormatTest -from petstore_api.models.has_only_read_only import HasOnlyReadOnly -from petstore_api.models.health_check_result import HealthCheckResult -from petstore_api.models.hunting_dog import HuntingDog -from petstore_api.models.info import Info -from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from petstore_api.models.input_all_of import InputAllOf -from petstore_api.models.int_or_string import IntOrString -from petstore_api.models.list_class import ListClass -from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel -from petstore_api.models.map_test import MapTest -from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass -from petstore_api.models.model200_response import Model200Response -from petstore_api.models.model_api_response import ModelApiResponse -from petstore_api.models.model_field import ModelField -from petstore_api.models.model_return import ModelReturn -from petstore_api.models.multi_arrays import MultiArrays -from petstore_api.models.name import Name -from petstore_api.models.nullable_class import NullableClass -from petstore_api.models.nullable_property import NullableProperty -from petstore_api.models.number_only import NumberOnly -from petstore_api.models.object_to_test_additional_properties import ObjectToTestAdditionalProperties -from petstore_api.models.object_with_deprecated_fields import ObjectWithDeprecatedFields -from petstore_api.models.one_of_enum_string import OneOfEnumString -from petstore_api.models.order import Order -from petstore_api.models.outer_composite import OuterComposite -from petstore_api.models.outer_enum import OuterEnum -from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue -from petstore_api.models.outer_enum_integer import OuterEnumInteger -from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue -from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty -from petstore_api.models.parent import Parent -from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict -from petstore_api.models.pet import Pet -from petstore_api.models.pig import Pig -from petstore_api.models.poop_cleaning import PoopCleaning -from petstore_api.models.primitive_string import PrimitiveString -from petstore_api.models.property_map import PropertyMap -from petstore_api.models.property_name_collision import PropertyNameCollision -from petstore_api.models.read_only_first import ReadOnlyFirst -from petstore_api.models.second_circular_all_of_ref import SecondCircularAllOfRef -from petstore_api.models.second_ref import SecondRef -from petstore_api.models.self_reference_model import SelfReferenceModel -from petstore_api.models.single_ref_type import SingleRefType -from petstore_api.models.special_character_enum import SpecialCharacterEnum -from petstore_api.models.special_model_name import SpecialModelName -from petstore_api.models.special_name import SpecialName -from petstore_api.models.tag import Tag -from petstore_api.models.task import Task -from petstore_api.models.task_activity import TaskActivity -from petstore_api.models.test_enum import TestEnum -from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from petstore_api.models.test_error_responses_with_model400_response import TestErrorResponsesWithModel400Response -from petstore_api.models.test_error_responses_with_model404_response import TestErrorResponsesWithModel404Response -from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest -from petstore_api.models.test_model_with_enum_default import TestModelWithEnumDefault -from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker -from petstore_api.models.tiger import Tiger -from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties -from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject -from petstore_api.models.user import User -from petstore_api.models.with_nested_one_of import WithNestedOneOf +from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType as AdditionalPropertiesAnyType +from petstore_api.models.additional_properties_class import AdditionalPropertiesClass as AdditionalPropertiesClass +from petstore_api.models.additional_properties_object import AdditionalPropertiesObject as AdditionalPropertiesObject +from petstore_api.models.additional_properties_with_description_only import AdditionalPropertiesWithDescriptionOnly as AdditionalPropertiesWithDescriptionOnly +from petstore_api.models.all_of_super_model import AllOfSuperModel as AllOfSuperModel +from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef as AllOfWithSingleRef +from petstore_api.models.animal import Animal as Animal +from petstore_api.models.any_of_color import AnyOfColor as AnyOfColor +from petstore_api.models.any_of_pig import AnyOfPig as AnyOfPig +from petstore_api.models.array_of_array_of_model import ArrayOfArrayOfModel as ArrayOfArrayOfModel +from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly as ArrayOfArrayOfNumberOnly +from petstore_api.models.array_of_number_only import ArrayOfNumberOnly as ArrayOfNumberOnly +from petstore_api.models.array_test import ArrayTest as ArrayTest +from petstore_api.models.base_discriminator import BaseDiscriminator as BaseDiscriminator +from petstore_api.models.basque_pig import BasquePig as BasquePig +from petstore_api.models.bathing import Bathing as Bathing +from petstore_api.models.capitalization import Capitalization as Capitalization +from petstore_api.models.cat import Cat as Cat +from petstore_api.models.category import Category as Category +from petstore_api.models.circular_all_of_ref import CircularAllOfRef as CircularAllOfRef +from petstore_api.models.circular_reference_model import CircularReferenceModel as CircularReferenceModel +from petstore_api.models.class_model import ClassModel as ClassModel +from petstore_api.models.client import Client as Client +from petstore_api.models.color import Color as Color +from petstore_api.models.creature import Creature as Creature +from petstore_api.models.creature_info import CreatureInfo as CreatureInfo +from petstore_api.models.danish_pig import DanishPig as DanishPig +from petstore_api.models.deprecated_object import DeprecatedObject as DeprecatedObject +from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub as DiscriminatorAllOfSub +from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper as DiscriminatorAllOfSuper +from petstore_api.models.dog import Dog as Dog +from petstore_api.models.dummy_model import DummyModel as DummyModel +from petstore_api.models.enum_arrays import EnumArrays as EnumArrays +from petstore_api.models.enum_class import EnumClass as EnumClass +from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt as EnumNumberVendorExt +from petstore_api.models.enum_string1 import EnumString1 as EnumString1 +from petstore_api.models.enum_string2 import EnumString2 as EnumString2 +from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt as EnumStringVendorExt +from petstore_api.models.enum_test import EnumTest as EnumTest +from petstore_api.models.feeding import Feeding as Feeding +from petstore_api.models.file import File as File +from petstore_api.models.file_schema_test_class import FileSchemaTestClass as FileSchemaTestClass +from petstore_api.models.first_ref import FirstRef as FirstRef +from petstore_api.models.foo import Foo as Foo +from petstore_api.models.foo_get_default_response import FooGetDefaultResponse as FooGetDefaultResponse +from petstore_api.models.format_test import FormatTest as FormatTest +from petstore_api.models.has_only_read_only import HasOnlyReadOnly as HasOnlyReadOnly +from petstore_api.models.health_check_result import HealthCheckResult as HealthCheckResult +from petstore_api.models.hunting_dog import HuntingDog as HuntingDog +from petstore_api.models.info import Info as Info +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty as InnerDictWithProperty +from petstore_api.models.input_all_of import InputAllOf as InputAllOf +from petstore_api.models.int_or_string import IntOrString as IntOrString +from petstore_api.models.list_class import ListClass as ListClass +from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel as MapOfArrayOfModel +from petstore_api.models.map_test import MapTest as MapTest +from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass as MixedPropertiesAndAdditionalPropertiesClass +from petstore_api.models.model200_response import Model200Response as Model200Response +from petstore_api.models.model_api_response import ModelApiResponse as ModelApiResponse +from petstore_api.models.model_field import ModelField as ModelField +from petstore_api.models.model_return import ModelReturn as ModelReturn +from petstore_api.models.multi_arrays import MultiArrays as MultiArrays +from petstore_api.models.name import Name as Name +from petstore_api.models.nullable_class import NullableClass as NullableClass +from petstore_api.models.nullable_property import NullableProperty as NullableProperty +from petstore_api.models.number_only import NumberOnly as NumberOnly +from petstore_api.models.object_to_test_additional_properties import ObjectToTestAdditionalProperties as ObjectToTestAdditionalProperties +from petstore_api.models.object_with_deprecated_fields import ObjectWithDeprecatedFields as ObjectWithDeprecatedFields +from petstore_api.models.one_of_enum_string import OneOfEnumString as OneOfEnumString +from petstore_api.models.order import Order as Order +from petstore_api.models.outer_composite import OuterComposite as OuterComposite +from petstore_api.models.outer_enum import OuterEnum as OuterEnum +from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue as OuterEnumDefaultValue +from petstore_api.models.outer_enum_integer import OuterEnumInteger as OuterEnumInteger +from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue as OuterEnumIntegerDefaultValue +from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty as OuterObjectWithEnumProperty +from petstore_api.models.parent import Parent as Parent +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict as ParentWithOptionalDict +from petstore_api.models.pet import Pet as Pet +from petstore_api.models.pig import Pig as Pig +from petstore_api.models.poop_cleaning import PoopCleaning as PoopCleaning +from petstore_api.models.primitive_string import PrimitiveString as PrimitiveString +from petstore_api.models.property_map import PropertyMap as PropertyMap +from petstore_api.models.property_name_collision import PropertyNameCollision as PropertyNameCollision +from petstore_api.models.read_only_first import ReadOnlyFirst as ReadOnlyFirst +from petstore_api.models.second_circular_all_of_ref import SecondCircularAllOfRef as SecondCircularAllOfRef +from petstore_api.models.second_ref import SecondRef as SecondRef +from petstore_api.models.self_reference_model import SelfReferenceModel as SelfReferenceModel +from petstore_api.models.single_ref_type import SingleRefType as SingleRefType +from petstore_api.models.special_character_enum import SpecialCharacterEnum as SpecialCharacterEnum +from petstore_api.models.special_model_name import SpecialModelName as SpecialModelName +from petstore_api.models.special_name import SpecialName as SpecialName +from petstore_api.models.tag import Tag as Tag +from petstore_api.models.task import Task as Task +from petstore_api.models.task_activity import TaskActivity as TaskActivity +from petstore_api.models.test_enum import TestEnum as TestEnum +from petstore_api.models.test_enum_with_default import TestEnumWithDefault as TestEnumWithDefault +from petstore_api.models.test_error_responses_with_model400_response import TestErrorResponsesWithModel400Response as TestErrorResponsesWithModel400Response +from petstore_api.models.test_error_responses_with_model404_response import TestErrorResponsesWithModel404Response as TestErrorResponsesWithModel404Response +from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest as TestInlineFreeformAdditionalPropertiesRequest +from petstore_api.models.test_model_with_enum_default import TestModelWithEnumDefault as TestModelWithEnumDefault +from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker as TestObjectForMultipartRequestsRequestMarker +from petstore_api.models.tiger import Tiger as Tiger +from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties +from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties +from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject +from petstore_api.models.user import User as User +from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/user_api.py index 17c80287ad53..4e6d222045bf 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/user_api.py @@ -54,7 +54,7 @@ class UserApi: _request_auth: Optional[Dict[StrictStr, Any]] = None, _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=3)] = 0, + _host_index: Annotated[StrictInt, Field(ge=0, le=4)] = 0, ) -> None: """Create user @@ -120,7 +120,7 @@ class UserApi: _request_auth: Optional[Dict[StrictStr, Any]] = None, _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=3)] = 0, + _host_index: Annotated[StrictInt, Field(ge=0, le=4)] = 0, ) -> ApiResponse[None]: """Create user @@ -186,7 +186,7 @@ class UserApi: _request_auth: Optional[Dict[StrictStr, Any]] = None, _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=3)] = 0, + _host_index: Annotated[StrictInt, Field(ge=0, le=4)] = 0, ) -> RESTResponseType: """Create user @@ -243,6 +243,7 @@ class UserApi: ) -> RequestSerialized: _hosts = [ + 'http://localhost/v2', 'http://petstore.swagger.io/v2', 'http://path-server-test.petstore.local/v2', 'http://{server}.swagger.io:{port}/v2' diff --git a/samples/openapi3/client/petstore/python-aiohttp/tests/test_api_client.py b/samples/openapi3/client/petstore/python-aiohttp/tests/test_api_client.py index 882e737f2434..f957b61ee78e 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/tests/test_api_client.py +++ b/samples/openapi3/client/petstore/python-aiohttp/tests/test_api_client.py @@ -30,7 +30,7 @@ class TestApiClient(unittest.IsolatedAsyncioTestCase): # operation servers should be used _, url, *_ = user_api_instance._create_user_serialize(**params_to_serialize) self.assertEqual(client.configuration.host, HOST) - self.assertEqual(url, 'http://petstore.swagger.io/v2/user') + self.assertEqual(url, 'http://localhost/v2/user') # operation servers should be ignored _, url_ignore, *_ = user_api_instance_ignore._create_user_serialize(**params_to_serialize) diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py index 0a6d6fdf8a2a..450799b5e559 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py @@ -147,133 +147,133 @@ __all__ = [ ] # import apis into sdk package -from petstore_api.api.another_fake_api import AnotherFakeApi -from petstore_api.api.default_api import DefaultApi -from petstore_api.api.fake_api import FakeApi -from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api -from petstore_api.api.import_test_datetime_api import ImportTestDatetimeApi -from petstore_api.api.pet_api import PetApi -from petstore_api.api.store_api import StoreApi -from petstore_api.api.user_api import UserApi +from petstore_api.api.another_fake_api import AnotherFakeApi as AnotherFakeApi +from petstore_api.api.default_api import DefaultApi as DefaultApi +from petstore_api.api.fake_api import FakeApi as FakeApi +from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api as FakeClassnameTags123Api +from petstore_api.api.import_test_datetime_api import ImportTestDatetimeApi as ImportTestDatetimeApi +from petstore_api.api.pet_api import PetApi as PetApi +from petstore_api.api.store_api import StoreApi as StoreApi +from petstore_api.api.user_api import UserApi as UserApi # import ApiClient -from petstore_api.api_response import ApiResponse -from petstore_api.api_client import ApiClient -from petstore_api.configuration import Configuration -from petstore_api.exceptions import OpenApiException -from petstore_api.exceptions import ApiTypeError -from petstore_api.exceptions import ApiValueError -from petstore_api.exceptions import ApiKeyError -from petstore_api.exceptions import ApiAttributeError -from petstore_api.exceptions import ApiException -from petstore_api.signing import HttpSigningConfiguration +from petstore_api.api_response import ApiResponse as ApiResponse +from petstore_api.api_client import ApiClient as ApiClient +from petstore_api.configuration import Configuration as Configuration +from petstore_api.exceptions import OpenApiException as OpenApiException +from petstore_api.exceptions import ApiTypeError as ApiTypeError +from petstore_api.exceptions import ApiValueError as ApiValueError +from petstore_api.exceptions import ApiKeyError as ApiKeyError +from petstore_api.exceptions import ApiAttributeError as ApiAttributeError +from petstore_api.exceptions import ApiException as ApiException +from petstore_api.signing import HttpSigningConfiguration as HttpSigningConfiguration # import models into sdk package -from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType -from petstore_api.models.additional_properties_class import AdditionalPropertiesClass -from petstore_api.models.additional_properties_object import AdditionalPropertiesObject -from petstore_api.models.additional_properties_with_description_only import AdditionalPropertiesWithDescriptionOnly -from petstore_api.models.all_of_super_model import AllOfSuperModel -from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef -from petstore_api.models.animal import Animal -from petstore_api.models.any_of_color import AnyOfColor -from petstore_api.models.any_of_pig import AnyOfPig -from petstore_api.models.api_response import ApiResponse -from petstore_api.models.array_of_array_of_model import ArrayOfArrayOfModel -from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly -from petstore_api.models.array_of_number_only import ArrayOfNumberOnly -from petstore_api.models.array_test import ArrayTest -from petstore_api.models.base_discriminator import BaseDiscriminator -from petstore_api.models.basque_pig import BasquePig -from petstore_api.models.bathing import Bathing -from petstore_api.models.capitalization import Capitalization -from petstore_api.models.cat import Cat -from petstore_api.models.category import Category -from petstore_api.models.circular_all_of_ref import CircularAllOfRef -from petstore_api.models.circular_reference_model import CircularReferenceModel -from petstore_api.models.class_model import ClassModel -from petstore_api.models.client import Client -from petstore_api.models.color import Color -from petstore_api.models.creature import Creature -from petstore_api.models.creature_info import CreatureInfo -from petstore_api.models.danish_pig import DanishPig -from petstore_api.models.deprecated_object import DeprecatedObject -from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub -from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from petstore_api.models.dog import Dog -from petstore_api.models.dummy_model import DummyModel -from petstore_api.models.enum_arrays import EnumArrays -from petstore_api.models.enum_class import EnumClass -from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt -from petstore_api.models.enum_string1 import EnumString1 -from petstore_api.models.enum_string2 import EnumString2 -from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt -from petstore_api.models.enum_test import EnumTest -from petstore_api.models.feeding import Feeding -from petstore_api.models.field import Field -from petstore_api.models.file import File -from petstore_api.models.file_schema_test_class import FileSchemaTestClass -from petstore_api.models.first_ref import FirstRef -from petstore_api.models.foo import Foo -from petstore_api.models.foo_get_default_response import FooGetDefaultResponse -from petstore_api.models.format_test import FormatTest -from petstore_api.models.has_only_read_only import HasOnlyReadOnly -from petstore_api.models.health_check_result import HealthCheckResult -from petstore_api.models.hunting_dog import HuntingDog -from petstore_api.models.info import Info -from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from petstore_api.models.input_all_of import InputAllOf -from petstore_api.models.int_or_string import IntOrString -from petstore_api.models.list_class import ListClass -from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel -from petstore_api.models.map_test import MapTest -from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass -from petstore_api.models.model200_response import Model200Response -from petstore_api.models.model_return import ModelReturn -from petstore_api.models.multi_arrays import MultiArrays -from petstore_api.models.name import Name -from petstore_api.models.nullable_class import NullableClass -from petstore_api.models.nullable_property import NullableProperty -from petstore_api.models.number_only import NumberOnly -from petstore_api.models.object_to_test_additional_properties import ObjectToTestAdditionalProperties -from petstore_api.models.object_with_deprecated_fields import ObjectWithDeprecatedFields -from petstore_api.models.one_of_enum_string import OneOfEnumString -from petstore_api.models.order import Order -from petstore_api.models.outer_composite import OuterComposite -from petstore_api.models.outer_enum import OuterEnum -from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue -from petstore_api.models.outer_enum_integer import OuterEnumInteger -from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue -from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty -from petstore_api.models.parent import Parent -from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict -from petstore_api.models.pet import Pet -from petstore_api.models.pig import Pig -from petstore_api.models.poop_cleaning import PoopCleaning -from petstore_api.models.primitive_string import PrimitiveString -from petstore_api.models.property_map import PropertyMap -from petstore_api.models.property_name_collision import PropertyNameCollision -from petstore_api.models.read_only_first import ReadOnlyFirst -from petstore_api.models.second_circular_all_of_ref import SecondCircularAllOfRef -from petstore_api.models.second_ref import SecondRef -from petstore_api.models.self_reference_model import SelfReferenceModel -from petstore_api.models.single_ref_type import SingleRefType -from petstore_api.models.special_character_enum import SpecialCharacterEnum -from petstore_api.models.special_model_name import SpecialModelName -from petstore_api.models.special_name import SpecialName -from petstore_api.models.tag import Tag -from petstore_api.models.task import Task -from petstore_api.models.task_activity import TaskActivity -from petstore_api.models.test_enum import TestEnum -from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from petstore_api.models.test_error_responses_with_model400_response import TestErrorResponsesWithModel400Response -from petstore_api.models.test_error_responses_with_model404_response import TestErrorResponsesWithModel404Response -from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest -from petstore_api.models.test_model_with_enum_default import TestModelWithEnumDefault -from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker -from petstore_api.models.tiger import Tiger -from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties -from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject -from petstore_api.models.user import User -from petstore_api.models.with_nested_one_of import WithNestedOneOf +from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType as AdditionalPropertiesAnyType +from petstore_api.models.additional_properties_class import AdditionalPropertiesClass as AdditionalPropertiesClass +from petstore_api.models.additional_properties_object import AdditionalPropertiesObject as AdditionalPropertiesObject +from petstore_api.models.additional_properties_with_description_only import AdditionalPropertiesWithDescriptionOnly as AdditionalPropertiesWithDescriptionOnly +from petstore_api.models.all_of_super_model import AllOfSuperModel as AllOfSuperModel +from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef as AllOfWithSingleRef +from petstore_api.models.animal import Animal as Animal +from petstore_api.models.any_of_color import AnyOfColor as AnyOfColor +from petstore_api.models.any_of_pig import AnyOfPig as AnyOfPig +from petstore_api.models.api_response import ApiResponse as ApiResponse +from petstore_api.models.array_of_array_of_model import ArrayOfArrayOfModel as ArrayOfArrayOfModel +from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly as ArrayOfArrayOfNumberOnly +from petstore_api.models.array_of_number_only import ArrayOfNumberOnly as ArrayOfNumberOnly +from petstore_api.models.array_test import ArrayTest as ArrayTest +from petstore_api.models.base_discriminator import BaseDiscriminator as BaseDiscriminator +from petstore_api.models.basque_pig import BasquePig as BasquePig +from petstore_api.models.bathing import Bathing as Bathing +from petstore_api.models.capitalization import Capitalization as Capitalization +from petstore_api.models.cat import Cat as Cat +from petstore_api.models.category import Category as Category +from petstore_api.models.circular_all_of_ref import CircularAllOfRef as CircularAllOfRef +from petstore_api.models.circular_reference_model import CircularReferenceModel as CircularReferenceModel +from petstore_api.models.class_model import ClassModel as ClassModel +from petstore_api.models.client import Client as Client +from petstore_api.models.color import Color as Color +from petstore_api.models.creature import Creature as Creature +from petstore_api.models.creature_info import CreatureInfo as CreatureInfo +from petstore_api.models.danish_pig import DanishPig as DanishPig +from petstore_api.models.deprecated_object import DeprecatedObject as DeprecatedObject +from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub as DiscriminatorAllOfSub +from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper as DiscriminatorAllOfSuper +from petstore_api.models.dog import Dog as Dog +from petstore_api.models.dummy_model import DummyModel as DummyModel +from petstore_api.models.enum_arrays import EnumArrays as EnumArrays +from petstore_api.models.enum_class import EnumClass as EnumClass +from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt as EnumNumberVendorExt +from petstore_api.models.enum_string1 import EnumString1 as EnumString1 +from petstore_api.models.enum_string2 import EnumString2 as EnumString2 +from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt as EnumStringVendorExt +from petstore_api.models.enum_test import EnumTest as EnumTest +from petstore_api.models.feeding import Feeding as Feeding +from petstore_api.models.field import Field as Field +from petstore_api.models.file import File as File +from petstore_api.models.file_schema_test_class import FileSchemaTestClass as FileSchemaTestClass +from petstore_api.models.first_ref import FirstRef as FirstRef +from petstore_api.models.foo import Foo as Foo +from petstore_api.models.foo_get_default_response import FooGetDefaultResponse as FooGetDefaultResponse +from petstore_api.models.format_test import FormatTest as FormatTest +from petstore_api.models.has_only_read_only import HasOnlyReadOnly as HasOnlyReadOnly +from petstore_api.models.health_check_result import HealthCheckResult as HealthCheckResult +from petstore_api.models.hunting_dog import HuntingDog as HuntingDog +from petstore_api.models.info import Info as Info +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty as InnerDictWithProperty +from petstore_api.models.input_all_of import InputAllOf as InputAllOf +from petstore_api.models.int_or_string import IntOrString as IntOrString +from petstore_api.models.list_class import ListClass as ListClass +from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel as MapOfArrayOfModel +from petstore_api.models.map_test import MapTest as MapTest +from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass as MixedPropertiesAndAdditionalPropertiesClass +from petstore_api.models.model200_response import Model200Response as Model200Response +from petstore_api.models.model_return import ModelReturn as ModelReturn +from petstore_api.models.multi_arrays import MultiArrays as MultiArrays +from petstore_api.models.name import Name as Name +from petstore_api.models.nullable_class import NullableClass as NullableClass +from petstore_api.models.nullable_property import NullableProperty as NullableProperty +from petstore_api.models.number_only import NumberOnly as NumberOnly +from petstore_api.models.object_to_test_additional_properties import ObjectToTestAdditionalProperties as ObjectToTestAdditionalProperties +from petstore_api.models.object_with_deprecated_fields import ObjectWithDeprecatedFields as ObjectWithDeprecatedFields +from petstore_api.models.one_of_enum_string import OneOfEnumString as OneOfEnumString +from petstore_api.models.order import Order as Order +from petstore_api.models.outer_composite import OuterComposite as OuterComposite +from petstore_api.models.outer_enum import OuterEnum as OuterEnum +from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue as OuterEnumDefaultValue +from petstore_api.models.outer_enum_integer import OuterEnumInteger as OuterEnumInteger +from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue as OuterEnumIntegerDefaultValue +from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty as OuterObjectWithEnumProperty +from petstore_api.models.parent import Parent as Parent +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict as ParentWithOptionalDict +from petstore_api.models.pet import Pet as Pet +from petstore_api.models.pig import Pig as Pig +from petstore_api.models.poop_cleaning import PoopCleaning as PoopCleaning +from petstore_api.models.primitive_string import PrimitiveString as PrimitiveString +from petstore_api.models.property_map import PropertyMap as PropertyMap +from petstore_api.models.property_name_collision import PropertyNameCollision as PropertyNameCollision +from petstore_api.models.read_only_first import ReadOnlyFirst as ReadOnlyFirst +from petstore_api.models.second_circular_all_of_ref import SecondCircularAllOfRef as SecondCircularAllOfRef +from petstore_api.models.second_ref import SecondRef as SecondRef +from petstore_api.models.self_reference_model import SelfReferenceModel as SelfReferenceModel +from petstore_api.models.single_ref_type import SingleRefType as SingleRefType +from petstore_api.models.special_character_enum import SpecialCharacterEnum as SpecialCharacterEnum +from petstore_api.models.special_model_name import SpecialModelName as SpecialModelName +from petstore_api.models.special_name import SpecialName as SpecialName +from petstore_api.models.tag import Tag as Tag +from petstore_api.models.task import Task as Task +from petstore_api.models.task_activity import TaskActivity as TaskActivity +from petstore_api.models.test_enum import TestEnum as TestEnum +from petstore_api.models.test_enum_with_default import TestEnumWithDefault as TestEnumWithDefault +from petstore_api.models.test_error_responses_with_model400_response import TestErrorResponsesWithModel400Response as TestErrorResponsesWithModel400Response +from petstore_api.models.test_error_responses_with_model404_response import TestErrorResponsesWithModel404Response as TestErrorResponsesWithModel404Response +from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest as TestInlineFreeformAdditionalPropertiesRequest +from petstore_api.models.test_model_with_enum_default import TestModelWithEnumDefault as TestModelWithEnumDefault +from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker as TestObjectForMultipartRequestsRequestMarker +from petstore_api.models.tiger import Tiger as Tiger +from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties +from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties +from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject +from petstore_api.models.user import User as User +from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/user_api.py index 379693e4bd0b..c26a41c0b048 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/user_api.py @@ -99,6 +99,7 @@ class UserApi: """ _hosts = [ + 'http://localhost/v2', 'http://petstore.swagger.io/v2', 'http://path-server-test.petstore.local/v2', 'http://{server}.swagger.io:{port}/v2' diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py index 0a6d6fdf8a2a..450799b5e559 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py @@ -147,133 +147,133 @@ __all__ = [ ] # import apis into sdk package -from petstore_api.api.another_fake_api import AnotherFakeApi -from petstore_api.api.default_api import DefaultApi -from petstore_api.api.fake_api import FakeApi -from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api -from petstore_api.api.import_test_datetime_api import ImportTestDatetimeApi -from petstore_api.api.pet_api import PetApi -from petstore_api.api.store_api import StoreApi -from petstore_api.api.user_api import UserApi +from petstore_api.api.another_fake_api import AnotherFakeApi as AnotherFakeApi +from petstore_api.api.default_api import DefaultApi as DefaultApi +from petstore_api.api.fake_api import FakeApi as FakeApi +from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api as FakeClassnameTags123Api +from petstore_api.api.import_test_datetime_api import ImportTestDatetimeApi as ImportTestDatetimeApi +from petstore_api.api.pet_api import PetApi as PetApi +from petstore_api.api.store_api import StoreApi as StoreApi +from petstore_api.api.user_api import UserApi as UserApi # import ApiClient -from petstore_api.api_response import ApiResponse -from petstore_api.api_client import ApiClient -from petstore_api.configuration import Configuration -from petstore_api.exceptions import OpenApiException -from petstore_api.exceptions import ApiTypeError -from petstore_api.exceptions import ApiValueError -from petstore_api.exceptions import ApiKeyError -from petstore_api.exceptions import ApiAttributeError -from petstore_api.exceptions import ApiException -from petstore_api.signing import HttpSigningConfiguration +from petstore_api.api_response import ApiResponse as ApiResponse +from petstore_api.api_client import ApiClient as ApiClient +from petstore_api.configuration import Configuration as Configuration +from petstore_api.exceptions import OpenApiException as OpenApiException +from petstore_api.exceptions import ApiTypeError as ApiTypeError +from petstore_api.exceptions import ApiValueError as ApiValueError +from petstore_api.exceptions import ApiKeyError as ApiKeyError +from petstore_api.exceptions import ApiAttributeError as ApiAttributeError +from petstore_api.exceptions import ApiException as ApiException +from petstore_api.signing import HttpSigningConfiguration as HttpSigningConfiguration # import models into sdk package -from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType -from petstore_api.models.additional_properties_class import AdditionalPropertiesClass -from petstore_api.models.additional_properties_object import AdditionalPropertiesObject -from petstore_api.models.additional_properties_with_description_only import AdditionalPropertiesWithDescriptionOnly -from petstore_api.models.all_of_super_model import AllOfSuperModel -from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef -from petstore_api.models.animal import Animal -from petstore_api.models.any_of_color import AnyOfColor -from petstore_api.models.any_of_pig import AnyOfPig -from petstore_api.models.api_response import ApiResponse -from petstore_api.models.array_of_array_of_model import ArrayOfArrayOfModel -from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly -from petstore_api.models.array_of_number_only import ArrayOfNumberOnly -from petstore_api.models.array_test import ArrayTest -from petstore_api.models.base_discriminator import BaseDiscriminator -from petstore_api.models.basque_pig import BasquePig -from petstore_api.models.bathing import Bathing -from petstore_api.models.capitalization import Capitalization -from petstore_api.models.cat import Cat -from petstore_api.models.category import Category -from petstore_api.models.circular_all_of_ref import CircularAllOfRef -from petstore_api.models.circular_reference_model import CircularReferenceModel -from petstore_api.models.class_model import ClassModel -from petstore_api.models.client import Client -from petstore_api.models.color import Color -from petstore_api.models.creature import Creature -from petstore_api.models.creature_info import CreatureInfo -from petstore_api.models.danish_pig import DanishPig -from petstore_api.models.deprecated_object import DeprecatedObject -from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub -from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from petstore_api.models.dog import Dog -from petstore_api.models.dummy_model import DummyModel -from petstore_api.models.enum_arrays import EnumArrays -from petstore_api.models.enum_class import EnumClass -from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt -from petstore_api.models.enum_string1 import EnumString1 -from petstore_api.models.enum_string2 import EnumString2 -from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt -from petstore_api.models.enum_test import EnumTest -from petstore_api.models.feeding import Feeding -from petstore_api.models.field import Field -from petstore_api.models.file import File -from petstore_api.models.file_schema_test_class import FileSchemaTestClass -from petstore_api.models.first_ref import FirstRef -from petstore_api.models.foo import Foo -from petstore_api.models.foo_get_default_response import FooGetDefaultResponse -from petstore_api.models.format_test import FormatTest -from petstore_api.models.has_only_read_only import HasOnlyReadOnly -from petstore_api.models.health_check_result import HealthCheckResult -from petstore_api.models.hunting_dog import HuntingDog -from petstore_api.models.info import Info -from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from petstore_api.models.input_all_of import InputAllOf -from petstore_api.models.int_or_string import IntOrString -from petstore_api.models.list_class import ListClass -from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel -from petstore_api.models.map_test import MapTest -from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass -from petstore_api.models.model200_response import Model200Response -from petstore_api.models.model_return import ModelReturn -from petstore_api.models.multi_arrays import MultiArrays -from petstore_api.models.name import Name -from petstore_api.models.nullable_class import NullableClass -from petstore_api.models.nullable_property import NullableProperty -from petstore_api.models.number_only import NumberOnly -from petstore_api.models.object_to_test_additional_properties import ObjectToTestAdditionalProperties -from petstore_api.models.object_with_deprecated_fields import ObjectWithDeprecatedFields -from petstore_api.models.one_of_enum_string import OneOfEnumString -from petstore_api.models.order import Order -from petstore_api.models.outer_composite import OuterComposite -from petstore_api.models.outer_enum import OuterEnum -from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue -from petstore_api.models.outer_enum_integer import OuterEnumInteger -from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue -from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty -from petstore_api.models.parent import Parent -from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict -from petstore_api.models.pet import Pet -from petstore_api.models.pig import Pig -from petstore_api.models.poop_cleaning import PoopCleaning -from petstore_api.models.primitive_string import PrimitiveString -from petstore_api.models.property_map import PropertyMap -from petstore_api.models.property_name_collision import PropertyNameCollision -from petstore_api.models.read_only_first import ReadOnlyFirst -from petstore_api.models.second_circular_all_of_ref import SecondCircularAllOfRef -from petstore_api.models.second_ref import SecondRef -from petstore_api.models.self_reference_model import SelfReferenceModel -from petstore_api.models.single_ref_type import SingleRefType -from petstore_api.models.special_character_enum import SpecialCharacterEnum -from petstore_api.models.special_model_name import SpecialModelName -from petstore_api.models.special_name import SpecialName -from petstore_api.models.tag import Tag -from petstore_api.models.task import Task -from petstore_api.models.task_activity import TaskActivity -from petstore_api.models.test_enum import TestEnum -from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from petstore_api.models.test_error_responses_with_model400_response import TestErrorResponsesWithModel400Response -from petstore_api.models.test_error_responses_with_model404_response import TestErrorResponsesWithModel404Response -from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest -from petstore_api.models.test_model_with_enum_default import TestModelWithEnumDefault -from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker -from petstore_api.models.tiger import Tiger -from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties -from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject -from petstore_api.models.user import User -from petstore_api.models.with_nested_one_of import WithNestedOneOf +from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType as AdditionalPropertiesAnyType +from petstore_api.models.additional_properties_class import AdditionalPropertiesClass as AdditionalPropertiesClass +from petstore_api.models.additional_properties_object import AdditionalPropertiesObject as AdditionalPropertiesObject +from petstore_api.models.additional_properties_with_description_only import AdditionalPropertiesWithDescriptionOnly as AdditionalPropertiesWithDescriptionOnly +from petstore_api.models.all_of_super_model import AllOfSuperModel as AllOfSuperModel +from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef as AllOfWithSingleRef +from petstore_api.models.animal import Animal as Animal +from petstore_api.models.any_of_color import AnyOfColor as AnyOfColor +from petstore_api.models.any_of_pig import AnyOfPig as AnyOfPig +from petstore_api.models.api_response import ApiResponse as ApiResponse +from petstore_api.models.array_of_array_of_model import ArrayOfArrayOfModel as ArrayOfArrayOfModel +from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly as ArrayOfArrayOfNumberOnly +from petstore_api.models.array_of_number_only import ArrayOfNumberOnly as ArrayOfNumberOnly +from petstore_api.models.array_test import ArrayTest as ArrayTest +from petstore_api.models.base_discriminator import BaseDiscriminator as BaseDiscriminator +from petstore_api.models.basque_pig import BasquePig as BasquePig +from petstore_api.models.bathing import Bathing as Bathing +from petstore_api.models.capitalization import Capitalization as Capitalization +from petstore_api.models.cat import Cat as Cat +from petstore_api.models.category import Category as Category +from petstore_api.models.circular_all_of_ref import CircularAllOfRef as CircularAllOfRef +from petstore_api.models.circular_reference_model import CircularReferenceModel as CircularReferenceModel +from petstore_api.models.class_model import ClassModel as ClassModel +from petstore_api.models.client import Client as Client +from petstore_api.models.color import Color as Color +from petstore_api.models.creature import Creature as Creature +from petstore_api.models.creature_info import CreatureInfo as CreatureInfo +from petstore_api.models.danish_pig import DanishPig as DanishPig +from petstore_api.models.deprecated_object import DeprecatedObject as DeprecatedObject +from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub as DiscriminatorAllOfSub +from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper as DiscriminatorAllOfSuper +from petstore_api.models.dog import Dog as Dog +from petstore_api.models.dummy_model import DummyModel as DummyModel +from petstore_api.models.enum_arrays import EnumArrays as EnumArrays +from petstore_api.models.enum_class import EnumClass as EnumClass +from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt as EnumNumberVendorExt +from petstore_api.models.enum_string1 import EnumString1 as EnumString1 +from petstore_api.models.enum_string2 import EnumString2 as EnumString2 +from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt as EnumStringVendorExt +from petstore_api.models.enum_test import EnumTest as EnumTest +from petstore_api.models.feeding import Feeding as Feeding +from petstore_api.models.field import Field as Field +from petstore_api.models.file import File as File +from petstore_api.models.file_schema_test_class import FileSchemaTestClass as FileSchemaTestClass +from petstore_api.models.first_ref import FirstRef as FirstRef +from petstore_api.models.foo import Foo as Foo +from petstore_api.models.foo_get_default_response import FooGetDefaultResponse as FooGetDefaultResponse +from petstore_api.models.format_test import FormatTest as FormatTest +from petstore_api.models.has_only_read_only import HasOnlyReadOnly as HasOnlyReadOnly +from petstore_api.models.health_check_result import HealthCheckResult as HealthCheckResult +from petstore_api.models.hunting_dog import HuntingDog as HuntingDog +from petstore_api.models.info import Info as Info +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty as InnerDictWithProperty +from petstore_api.models.input_all_of import InputAllOf as InputAllOf +from petstore_api.models.int_or_string import IntOrString as IntOrString +from petstore_api.models.list_class import ListClass as ListClass +from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel as MapOfArrayOfModel +from petstore_api.models.map_test import MapTest as MapTest +from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass as MixedPropertiesAndAdditionalPropertiesClass +from petstore_api.models.model200_response import Model200Response as Model200Response +from petstore_api.models.model_return import ModelReturn as ModelReturn +from petstore_api.models.multi_arrays import MultiArrays as MultiArrays +from petstore_api.models.name import Name as Name +from petstore_api.models.nullable_class import NullableClass as NullableClass +from petstore_api.models.nullable_property import NullableProperty as NullableProperty +from petstore_api.models.number_only import NumberOnly as NumberOnly +from petstore_api.models.object_to_test_additional_properties import ObjectToTestAdditionalProperties as ObjectToTestAdditionalProperties +from petstore_api.models.object_with_deprecated_fields import ObjectWithDeprecatedFields as ObjectWithDeprecatedFields +from petstore_api.models.one_of_enum_string import OneOfEnumString as OneOfEnumString +from petstore_api.models.order import Order as Order +from petstore_api.models.outer_composite import OuterComposite as OuterComposite +from petstore_api.models.outer_enum import OuterEnum as OuterEnum +from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue as OuterEnumDefaultValue +from petstore_api.models.outer_enum_integer import OuterEnumInteger as OuterEnumInteger +from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue as OuterEnumIntegerDefaultValue +from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty as OuterObjectWithEnumProperty +from petstore_api.models.parent import Parent as Parent +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict as ParentWithOptionalDict +from petstore_api.models.pet import Pet as Pet +from petstore_api.models.pig import Pig as Pig +from petstore_api.models.poop_cleaning import PoopCleaning as PoopCleaning +from petstore_api.models.primitive_string import PrimitiveString as PrimitiveString +from petstore_api.models.property_map import PropertyMap as PropertyMap +from petstore_api.models.property_name_collision import PropertyNameCollision as PropertyNameCollision +from petstore_api.models.read_only_first import ReadOnlyFirst as ReadOnlyFirst +from petstore_api.models.second_circular_all_of_ref import SecondCircularAllOfRef as SecondCircularAllOfRef +from petstore_api.models.second_ref import SecondRef as SecondRef +from petstore_api.models.self_reference_model import SelfReferenceModel as SelfReferenceModel +from petstore_api.models.single_ref_type import SingleRefType as SingleRefType +from petstore_api.models.special_character_enum import SpecialCharacterEnum as SpecialCharacterEnum +from petstore_api.models.special_model_name import SpecialModelName as SpecialModelName +from petstore_api.models.special_name import SpecialName as SpecialName +from petstore_api.models.tag import Tag as Tag +from petstore_api.models.task import Task as Task +from petstore_api.models.task_activity import TaskActivity as TaskActivity +from petstore_api.models.test_enum import TestEnum as TestEnum +from petstore_api.models.test_enum_with_default import TestEnumWithDefault as TestEnumWithDefault +from petstore_api.models.test_error_responses_with_model400_response import TestErrorResponsesWithModel400Response as TestErrorResponsesWithModel400Response +from petstore_api.models.test_error_responses_with_model404_response import TestErrorResponsesWithModel404Response as TestErrorResponsesWithModel404Response +from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest as TestInlineFreeformAdditionalPropertiesRequest +from petstore_api.models.test_model_with_enum_default import TestModelWithEnumDefault as TestModelWithEnumDefault +from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker as TestObjectForMultipartRequestsRequestMarker +from petstore_api.models.tiger import Tiger as Tiger +from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties +from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties +from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject +from petstore_api.models.user import User as User +from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/user_api.py index 41ccd5601535..0f9c0458d742 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/user_api.py @@ -112,6 +112,7 @@ class UserApi: """ _hosts = [ + 'http://localhost/v2', 'http://petstore.swagger.io/v2', 'http://path-server-test.petstore.local/v2', 'http://{server}.swagger.io:{port}/v2' diff --git a/samples/openapi3/client/petstore/python/petstore_api/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/__init__.py index 3c1abd3c2ee7..50788f3e21c0 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python/petstore_api/__init__.py @@ -147,133 +147,133 @@ __all__ = [ ] # import apis into sdk package -from petstore_api.api.another_fake_api import AnotherFakeApi -from petstore_api.api.default_api import DefaultApi -from petstore_api.api.fake_api import FakeApi -from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api -from petstore_api.api.import_test_datetime_api import ImportTestDatetimeApi -from petstore_api.api.pet_api import PetApi -from petstore_api.api.store_api import StoreApi -from petstore_api.api.user_api import UserApi +from petstore_api.api.another_fake_api import AnotherFakeApi as AnotherFakeApi +from petstore_api.api.default_api import DefaultApi as DefaultApi +from petstore_api.api.fake_api import FakeApi as FakeApi +from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api as FakeClassnameTags123Api +from petstore_api.api.import_test_datetime_api import ImportTestDatetimeApi as ImportTestDatetimeApi +from petstore_api.api.pet_api import PetApi as PetApi +from petstore_api.api.store_api import StoreApi as StoreApi +from petstore_api.api.user_api import UserApi as UserApi # import ApiClient -from petstore_api.api_response import ApiResponse -from petstore_api.api_client import ApiClient -from petstore_api.configuration import Configuration -from petstore_api.exceptions import OpenApiException -from petstore_api.exceptions import ApiTypeError -from petstore_api.exceptions import ApiValueError -from petstore_api.exceptions import ApiKeyError -from petstore_api.exceptions import ApiAttributeError -from petstore_api.exceptions import ApiException -from petstore_api.signing import HttpSigningConfiguration +from petstore_api.api_response import ApiResponse as ApiResponse +from petstore_api.api_client import ApiClient as ApiClient +from petstore_api.configuration import Configuration as Configuration +from petstore_api.exceptions import OpenApiException as OpenApiException +from petstore_api.exceptions import ApiTypeError as ApiTypeError +from petstore_api.exceptions import ApiValueError as ApiValueError +from petstore_api.exceptions import ApiKeyError as ApiKeyError +from petstore_api.exceptions import ApiAttributeError as ApiAttributeError +from petstore_api.exceptions import ApiException as ApiException +from petstore_api.signing import HttpSigningConfiguration as HttpSigningConfiguration # import models into sdk package -from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType -from petstore_api.models.additional_properties_class import AdditionalPropertiesClass -from petstore_api.models.additional_properties_object import AdditionalPropertiesObject -from petstore_api.models.additional_properties_with_description_only import AdditionalPropertiesWithDescriptionOnly -from petstore_api.models.all_of_super_model import AllOfSuperModel -from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef -from petstore_api.models.animal import Animal -from petstore_api.models.any_of_color import AnyOfColor -from petstore_api.models.any_of_pig import AnyOfPig -from petstore_api.models.array_of_array_of_model import ArrayOfArrayOfModel -from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly -from petstore_api.models.array_of_number_only import ArrayOfNumberOnly -from petstore_api.models.array_test import ArrayTest -from petstore_api.models.base_discriminator import BaseDiscriminator -from petstore_api.models.basque_pig import BasquePig -from petstore_api.models.bathing import Bathing -from petstore_api.models.capitalization import Capitalization -from petstore_api.models.cat import Cat -from petstore_api.models.category import Category -from petstore_api.models.circular_all_of_ref import CircularAllOfRef -from petstore_api.models.circular_reference_model import CircularReferenceModel -from petstore_api.models.class_model import ClassModel -from petstore_api.models.client import Client -from petstore_api.models.color import Color -from petstore_api.models.creature import Creature -from petstore_api.models.creature_info import CreatureInfo -from petstore_api.models.danish_pig import DanishPig -from petstore_api.models.deprecated_object import DeprecatedObject -from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub -from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from petstore_api.models.dog import Dog -from petstore_api.models.dummy_model import DummyModel -from petstore_api.models.enum_arrays import EnumArrays -from petstore_api.models.enum_class import EnumClass -from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt -from petstore_api.models.enum_string1 import EnumString1 -from petstore_api.models.enum_string2 import EnumString2 -from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt -from petstore_api.models.enum_test import EnumTest -from petstore_api.models.feeding import Feeding -from petstore_api.models.file import File -from petstore_api.models.file_schema_test_class import FileSchemaTestClass -from petstore_api.models.first_ref import FirstRef -from petstore_api.models.foo import Foo -from petstore_api.models.foo_get_default_response import FooGetDefaultResponse -from petstore_api.models.format_test import FormatTest -from petstore_api.models.has_only_read_only import HasOnlyReadOnly -from petstore_api.models.health_check_result import HealthCheckResult -from petstore_api.models.hunting_dog import HuntingDog -from petstore_api.models.info import Info -from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from petstore_api.models.input_all_of import InputAllOf -from petstore_api.models.int_or_string import IntOrString -from petstore_api.models.list_class import ListClass -from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel -from petstore_api.models.map_test import MapTest -from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass -from petstore_api.models.model200_response import Model200Response -from petstore_api.models.model_api_response import ModelApiResponse -from petstore_api.models.model_field import ModelField -from petstore_api.models.model_return import ModelReturn -from petstore_api.models.multi_arrays import MultiArrays -from petstore_api.models.name import Name -from petstore_api.models.nullable_class import NullableClass -from petstore_api.models.nullable_property import NullableProperty -from petstore_api.models.number_only import NumberOnly -from petstore_api.models.object_to_test_additional_properties import ObjectToTestAdditionalProperties -from petstore_api.models.object_with_deprecated_fields import ObjectWithDeprecatedFields -from petstore_api.models.one_of_enum_string import OneOfEnumString -from petstore_api.models.order import Order -from petstore_api.models.outer_composite import OuterComposite -from petstore_api.models.outer_enum import OuterEnum -from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue -from petstore_api.models.outer_enum_integer import OuterEnumInteger -from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue -from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty -from petstore_api.models.parent import Parent -from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict -from petstore_api.models.pet import Pet -from petstore_api.models.pig import Pig -from petstore_api.models.poop_cleaning import PoopCleaning -from petstore_api.models.primitive_string import PrimitiveString -from petstore_api.models.property_map import PropertyMap -from petstore_api.models.property_name_collision import PropertyNameCollision -from petstore_api.models.read_only_first import ReadOnlyFirst -from petstore_api.models.second_circular_all_of_ref import SecondCircularAllOfRef -from petstore_api.models.second_ref import SecondRef -from petstore_api.models.self_reference_model import SelfReferenceModel -from petstore_api.models.single_ref_type import SingleRefType -from petstore_api.models.special_character_enum import SpecialCharacterEnum -from petstore_api.models.special_model_name import SpecialModelName -from petstore_api.models.special_name import SpecialName -from petstore_api.models.tag import Tag -from petstore_api.models.task import Task -from petstore_api.models.task_activity import TaskActivity -from petstore_api.models.test_enum import TestEnum -from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from petstore_api.models.test_error_responses_with_model400_response import TestErrorResponsesWithModel400Response -from petstore_api.models.test_error_responses_with_model404_response import TestErrorResponsesWithModel404Response -from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest -from petstore_api.models.test_model_with_enum_default import TestModelWithEnumDefault -from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker -from petstore_api.models.tiger import Tiger -from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties -from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject -from petstore_api.models.user import User -from petstore_api.models.with_nested_one_of import WithNestedOneOf +from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType as AdditionalPropertiesAnyType +from petstore_api.models.additional_properties_class import AdditionalPropertiesClass as AdditionalPropertiesClass +from petstore_api.models.additional_properties_object import AdditionalPropertiesObject as AdditionalPropertiesObject +from petstore_api.models.additional_properties_with_description_only import AdditionalPropertiesWithDescriptionOnly as AdditionalPropertiesWithDescriptionOnly +from petstore_api.models.all_of_super_model import AllOfSuperModel as AllOfSuperModel +from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef as AllOfWithSingleRef +from petstore_api.models.animal import Animal as Animal +from petstore_api.models.any_of_color import AnyOfColor as AnyOfColor +from petstore_api.models.any_of_pig import AnyOfPig as AnyOfPig +from petstore_api.models.array_of_array_of_model import ArrayOfArrayOfModel as ArrayOfArrayOfModel +from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly as ArrayOfArrayOfNumberOnly +from petstore_api.models.array_of_number_only import ArrayOfNumberOnly as ArrayOfNumberOnly +from petstore_api.models.array_test import ArrayTest as ArrayTest +from petstore_api.models.base_discriminator import BaseDiscriminator as BaseDiscriminator +from petstore_api.models.basque_pig import BasquePig as BasquePig +from petstore_api.models.bathing import Bathing as Bathing +from petstore_api.models.capitalization import Capitalization as Capitalization +from petstore_api.models.cat import Cat as Cat +from petstore_api.models.category import Category as Category +from petstore_api.models.circular_all_of_ref import CircularAllOfRef as CircularAllOfRef +from petstore_api.models.circular_reference_model import CircularReferenceModel as CircularReferenceModel +from petstore_api.models.class_model import ClassModel as ClassModel +from petstore_api.models.client import Client as Client +from petstore_api.models.color import Color as Color +from petstore_api.models.creature import Creature as Creature +from petstore_api.models.creature_info import CreatureInfo as CreatureInfo +from petstore_api.models.danish_pig import DanishPig as DanishPig +from petstore_api.models.deprecated_object import DeprecatedObject as DeprecatedObject +from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub as DiscriminatorAllOfSub +from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper as DiscriminatorAllOfSuper +from petstore_api.models.dog import Dog as Dog +from petstore_api.models.dummy_model import DummyModel as DummyModel +from petstore_api.models.enum_arrays import EnumArrays as EnumArrays +from petstore_api.models.enum_class import EnumClass as EnumClass +from petstore_api.models.enum_number_vendor_ext import EnumNumberVendorExt as EnumNumberVendorExt +from petstore_api.models.enum_string1 import EnumString1 as EnumString1 +from petstore_api.models.enum_string2 import EnumString2 as EnumString2 +from petstore_api.models.enum_string_vendor_ext import EnumStringVendorExt as EnumStringVendorExt +from petstore_api.models.enum_test import EnumTest as EnumTest +from petstore_api.models.feeding import Feeding as Feeding +from petstore_api.models.file import File as File +from petstore_api.models.file_schema_test_class import FileSchemaTestClass as FileSchemaTestClass +from petstore_api.models.first_ref import FirstRef as FirstRef +from petstore_api.models.foo import Foo as Foo +from petstore_api.models.foo_get_default_response import FooGetDefaultResponse as FooGetDefaultResponse +from petstore_api.models.format_test import FormatTest as FormatTest +from petstore_api.models.has_only_read_only import HasOnlyReadOnly as HasOnlyReadOnly +from petstore_api.models.health_check_result import HealthCheckResult as HealthCheckResult +from petstore_api.models.hunting_dog import HuntingDog as HuntingDog +from petstore_api.models.info import Info as Info +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty as InnerDictWithProperty +from petstore_api.models.input_all_of import InputAllOf as InputAllOf +from petstore_api.models.int_or_string import IntOrString as IntOrString +from petstore_api.models.list_class import ListClass as ListClass +from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel as MapOfArrayOfModel +from petstore_api.models.map_test import MapTest as MapTest +from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass as MixedPropertiesAndAdditionalPropertiesClass +from petstore_api.models.model200_response import Model200Response as Model200Response +from petstore_api.models.model_api_response import ModelApiResponse as ModelApiResponse +from petstore_api.models.model_field import ModelField as ModelField +from petstore_api.models.model_return import ModelReturn as ModelReturn +from petstore_api.models.multi_arrays import MultiArrays as MultiArrays +from petstore_api.models.name import Name as Name +from petstore_api.models.nullable_class import NullableClass as NullableClass +from petstore_api.models.nullable_property import NullableProperty as NullableProperty +from petstore_api.models.number_only import NumberOnly as NumberOnly +from petstore_api.models.object_to_test_additional_properties import ObjectToTestAdditionalProperties as ObjectToTestAdditionalProperties +from petstore_api.models.object_with_deprecated_fields import ObjectWithDeprecatedFields as ObjectWithDeprecatedFields +from petstore_api.models.one_of_enum_string import OneOfEnumString as OneOfEnumString +from petstore_api.models.order import Order as Order +from petstore_api.models.outer_composite import OuterComposite as OuterComposite +from petstore_api.models.outer_enum import OuterEnum as OuterEnum +from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue as OuterEnumDefaultValue +from petstore_api.models.outer_enum_integer import OuterEnumInteger as OuterEnumInteger +from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue as OuterEnumIntegerDefaultValue +from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty as OuterObjectWithEnumProperty +from petstore_api.models.parent import Parent as Parent +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict as ParentWithOptionalDict +from petstore_api.models.pet import Pet as Pet +from petstore_api.models.pig import Pig as Pig +from petstore_api.models.poop_cleaning import PoopCleaning as PoopCleaning +from petstore_api.models.primitive_string import PrimitiveString as PrimitiveString +from petstore_api.models.property_map import PropertyMap as PropertyMap +from petstore_api.models.property_name_collision import PropertyNameCollision as PropertyNameCollision +from petstore_api.models.read_only_first import ReadOnlyFirst as ReadOnlyFirst +from petstore_api.models.second_circular_all_of_ref import SecondCircularAllOfRef as SecondCircularAllOfRef +from petstore_api.models.second_ref import SecondRef as SecondRef +from petstore_api.models.self_reference_model import SelfReferenceModel as SelfReferenceModel +from petstore_api.models.single_ref_type import SingleRefType as SingleRefType +from petstore_api.models.special_character_enum import SpecialCharacterEnum as SpecialCharacterEnum +from petstore_api.models.special_model_name import SpecialModelName as SpecialModelName +from petstore_api.models.special_name import SpecialName as SpecialName +from petstore_api.models.tag import Tag as Tag +from petstore_api.models.task import Task as Task +from petstore_api.models.task_activity import TaskActivity as TaskActivity +from petstore_api.models.test_enum import TestEnum as TestEnum +from petstore_api.models.test_enum_with_default import TestEnumWithDefault as TestEnumWithDefault +from petstore_api.models.test_error_responses_with_model400_response import TestErrorResponsesWithModel400Response as TestErrorResponsesWithModel400Response +from petstore_api.models.test_error_responses_with_model404_response import TestErrorResponsesWithModel404Response as TestErrorResponsesWithModel404Response +from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest as TestInlineFreeformAdditionalPropertiesRequest +from petstore_api.models.test_model_with_enum_default import TestModelWithEnumDefault as TestModelWithEnumDefault +from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker as TestObjectForMultipartRequestsRequestMarker +from petstore_api.models.tiger import Tiger as Tiger +from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties +from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties +from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject +from petstore_api.models.user import User as User +from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py index 36463cd1daef..b2a4ced88095 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py @@ -54,7 +54,7 @@ class UserApi: _request_auth: Optional[Dict[StrictStr, Any]] = None, _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=3)] = 0, + _host_index: Annotated[StrictInt, Field(ge=0, le=4)] = 0, ) -> None: """Create user @@ -120,7 +120,7 @@ class UserApi: _request_auth: Optional[Dict[StrictStr, Any]] = None, _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=3)] = 0, + _host_index: Annotated[StrictInt, Field(ge=0, le=4)] = 0, ) -> ApiResponse[None]: """Create user @@ -186,7 +186,7 @@ class UserApi: _request_auth: Optional[Dict[StrictStr, Any]] = None, _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=3)] = 0, + _host_index: Annotated[StrictInt, Field(ge=0, le=4)] = 0, ) -> RESTResponseType: """Create user @@ -243,6 +243,7 @@ class UserApi: ) -> RequestSerialized: _hosts = [ + 'http://localhost/v2', 'http://petstore.swagger.io/v2', 'http://path-server-test.petstore.local/v2', 'http://{server}.swagger.io:{port}/v2' diff --git a/samples/openapi3/client/petstore/python/tests/test_api_client.py b/samples/openapi3/client/petstore/python/tests/test_api_client.py index a84bf1b62300..d0448d031f58 100644 --- a/samples/openapi3/client/petstore/python/tests/test_api_client.py +++ b/samples/openapi3/client/petstore/python/tests/test_api_client.py @@ -77,7 +77,7 @@ class ApiClientTests(unittest.TestCase): # operation servers should be used _, url, *_ = user_api_instance._create_user_serialize(**params_to_serialize) self.assertEqual(client.configuration.host, HOST) - self.assertEqual(url, 'http://petstore.swagger.io/v2/user') + self.assertEqual(url, 'http://localhost/v2/user') # operation servers should be ignored _, url_ignore, *_ = user_api_instance_ignore._create_user_serialize(**params_to_serialize)