From ac786cb2e03ccf31dc6846e691a55390ea8a0c0e Mon Sep 17 00:00:00 2001 From: timonrieger Date: Sat, 14 Nov 2026 19:23:03 +0100 Subject: [PATCH 1/2] [python] drop typing-extensions --- .../codegen/languages/AbstractPythonCodegen.java | 2 +- .../src/main/resources/python/README_onlypackage.mustache | 1 - .../src/main/resources/python/api.mustache | 3 +-- .../src/main/resources/python/configuration.mustache | 3 +-- .../src/main/resources/python/exceptions.mustache | 3 +-- .../src/main/resources/python/model_anyof.mustache | 3 +-- .../src/main/resources/python/model_enum.mustache | 2 +- .../src/main/resources/python/model_generic.mustache | 3 +-- .../src/main/resources/python/model_oneof.mustache | 3 +-- .../src/main/resources/python/pyproject.mustache | 2 -- .../src/main/resources/python/requirements.mustache | 1 - .../src/main/resources/python/setup.mustache | 1 - .../openapi_client/api/auth_api.py | 3 +-- .../openapi_client/api/body_api.py | 6 ++---- .../openapi_client/api/form_api.py | 3 +-- .../openapi_client/api/header_api.py | 3 +-- .../openapi_client/api/path_api.py | 3 +-- .../openapi_client/api/query_api.py | 3 +-- .../openapi_client/configuration.py | 3 +-- .../openapi_client/exceptions.py | 3 +-- .../openapi_client/models/bird.py | 3 +-- .../openapi_client/models/category.py | 3 +-- .../openapi_client/models/data_query.py | 3 +-- .../openapi_client/models/default_value.py | 3 +-- .../openapi_client/models/number_properties_only.py | 6 ++---- .../openapi_client/models/pet.py | 3 +-- .../openapi_client/models/query.py | 3 +-- .../openapi_client/models/string_enum_ref.py | 2 +- .../openapi_client/models/tag.py | 3 +-- .../models/test_form_object_multipart_request_marker.py | 3 +-- ...ect_explode_true_object_all_of_query_object_parameter.py | 3 +-- ...form_explode_true_array_string_query_object_parameter.py | 3 +-- .../pyproject.toml | 1 - .../requirements.txt | 1 - .../setup.py | 1 - .../client/echo_api/python/openapi_client/api/auth_api.py | 3 +-- .../client/echo_api/python/openapi_client/api/body_api.py | 6 ++---- .../client/echo_api/python/openapi_client/api/form_api.py | 3 +-- .../client/echo_api/python/openapi_client/api/header_api.py | 3 +-- .../client/echo_api/python/openapi_client/api/path_api.py | 3 +-- .../client/echo_api/python/openapi_client/api/query_api.py | 3 +-- .../client/echo_api/python/openapi_client/configuration.py | 3 +-- samples/client/echo_api/python/openapi_client/exceptions.py | 3 +-- .../client/echo_api/python/openapi_client/models/bird.py | 3 +-- .../echo_api/python/openapi_client/models/category.py | 3 +-- .../echo_api/python/openapi_client/models/data_query.py | 3 +-- .../echo_api/python/openapi_client/models/default_value.py | 3 +-- .../python/openapi_client/models/number_properties_only.py | 6 ++---- samples/client/echo_api/python/openapi_client/models/pet.py | 3 +-- .../client/echo_api/python/openapi_client/models/query.py | 3 +-- .../python/openapi_client/models/string_enum_ref.py | 2 +- samples/client/echo_api/python/openapi_client/models/tag.py | 3 +-- .../models/test_form_object_multipart_request_marker.py | 3 +-- ...ect_explode_true_object_all_of_query_object_parameter.py | 3 +-- ...form_explode_true_array_string_query_object_parameter.py | 3 +-- samples/client/echo_api/python/pyproject.toml | 1 - samples/client/echo_api/python/requirements.txt | 1 - samples/client/echo_api/python/setup.py | 1 - .../legacy_model_dict_client/api/default_api.py | 3 +-- .../legacy_model_dict_client/configuration.py | 3 +-- .../legacy_model_dict_client/exceptions.py | 3 +-- .../models/additional_properties_model.py | 3 +-- .../legacy_model_dict_client/models/any_of_model.py | 3 +-- .../legacy_model_dict_client/models/legacy_base.py | 3 +-- .../legacy_model_dict_client/models/legacy_model.py | 3 +-- .../legacy_model_dict_client/models/nested_model.py | 3 +-- .../legacy_model_dict_client/models/one_of_model.py | 3 +-- .../others/python-legacy-model-dictionaries/pyproject.toml | 1 - .../python-legacy-model-dictionaries/requirements.txt | 1 - .../client/others/python-legacy-model-dictionaries/setup.py | 1 - .../python-aiohttp/petstore_api/api/another_fake_api.py | 5 ++--- .../petstore/python-aiohttp/petstore_api/api/default_api.py | 3 +-- .../petstore/python-aiohttp/petstore_api/api/fake_api.py | 6 ++---- .../petstore_api/api/fake_classname_tags123_api.py | 5 ++--- .../petstore_api/api/import_test_datetime_api.py | 3 +-- .../petstore/python-aiohttp/petstore_api/api/pet_api.py | 6 ++---- .../petstore/python-aiohttp/petstore_api/api/store_api.py | 6 ++---- .../petstore/python-aiohttp/petstore_api/api/user_api.py | 6 ++---- .../petstore/python-aiohttp/petstore_api/configuration.py | 3 +-- .../petstore/python-aiohttp/petstore_api/exceptions.py | 3 +-- .../petstore_api/models/additional_properties_any_type.py | 3 +-- .../petstore_api/models/additional_properties_class.py | 3 +-- .../petstore_api/models/additional_properties_object.py | 3 +-- .../models/additional_properties_with_description_only.py | 3 +-- .../petstore_api/models/all_of_super_model.py | 3 +-- .../petstore_api/models/all_of_with_single_ref.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/animal.py | 3 +-- .../python-aiohttp/petstore_api/models/any_of_color.py | 6 ++---- .../python-aiohttp/petstore_api/models/any_of_pig.py | 3 +-- .../petstore_api/models/array_of_array_of_model.py | 3 +-- .../petstore_api/models/array_of_array_of_number_only.py | 3 +-- .../petstore_api/models/array_of_map_model.py | 3 +-- .../petstore_api/models/array_of_number_only.py | 3 +-- .../python-aiohttp/petstore_api/models/array_test.py | 6 ++---- .../petstore_api/models/base_discriminator.py | 3 +-- .../python-aiohttp/petstore_api/models/basque_pig.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/bathing.py | 3 +-- .../python-aiohttp/petstore_api/models/capitalization.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/cat.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/category.py | 3 +-- .../petstore_api/models/circular_all_of_ref.py | 3 +-- .../petstore_api/models/circular_reference_model.py | 3 +-- .../python-aiohttp/petstore_api/models/class_model.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/client.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/color.py | 6 ++---- .../petstore/python-aiohttp/petstore_api/models/creature.py | 3 +-- .../python-aiohttp/petstore_api/models/creature_info.py | 3 +-- .../python-aiohttp/petstore_api/models/danish_pig.py | 3 +-- .../petstore_api/models/data_output_format.py | 2 +- .../python-aiohttp/petstore_api/models/deprecated_object.py | 3 +-- .../petstore_api/models/discriminator_all_of_sub.py | 3 +-- .../petstore_api/models/discriminator_all_of_super.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/dog.py | 3 +-- .../python-aiohttp/petstore_api/models/dummy_model.py | 3 +-- .../python-aiohttp/petstore_api/models/enum_arrays.py | 3 +-- .../python-aiohttp/petstore_api/models/enum_class.py | 2 +- .../petstore_api/models/enum_number_vendor_ext.py | 2 +- .../petstore_api/models/enum_ref_with_default_value.py | 3 +-- .../python-aiohttp/petstore_api/models/enum_string1.py | 2 +- .../python-aiohttp/petstore_api/models/enum_string2.py | 2 +- .../petstore_api/models/enum_string_vendor_ext.py | 2 +- .../python-aiohttp/petstore_api/models/enum_test.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/feeding.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/file.py | 3 +-- .../petstore_api/models/file_schema_test_class.py | 3 +-- .../python-aiohttp/petstore_api/models/first_ref.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/foo.py | 3 +-- .../petstore_api/models/foo_get_default_response.py | 3 +-- .../python-aiohttp/petstore_api/models/format_test.py | 6 ++---- .../petstore_api/models/has_only_read_only.py | 3 +-- .../python-aiohttp/petstore_api/models/header_arg.py | 3 +-- .../petstore_api/models/health_check_result.py | 3 +-- .../python-aiohttp/petstore_api/models/hunting_dog.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/info.py | 3 +-- .../petstore_api/models/inner_dict_with_property.py | 3 +-- .../python-aiohttp/petstore_api/models/input_all_of.py | 3 +-- .../python-aiohttp/petstore_api/models/int_or_string.py | 6 ++---- .../petstore/python-aiohttp/petstore_api/models/known.py | 3 +-- .../python-aiohttp/petstore_api/models/list_class.py | 3 +-- .../petstore_api/models/map_of_array_of_model.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/map_test.py | 3 +-- .../mixed_properties_and_additional_properties_class.py | 3 +-- .../python-aiohttp/petstore_api/models/model200_response.py | 3 +-- .../petstore_api/models/model_api_response.py | 3 +-- .../python-aiohttp/petstore_api/models/model_field.py | 3 +-- .../python-aiohttp/petstore_api/models/model_return.py | 3 +-- .../python-aiohttp/petstore_api/models/multi_arrays.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/name.py | 3 +-- .../python-aiohttp/petstore_api/models/nullable_class.py | 3 +-- .../python-aiohttp/petstore_api/models/nullable_property.py | 6 ++---- .../python-aiohttp/petstore_api/models/number_only.py | 3 +-- .../models/object_to_test_additional_properties.py | 3 +-- .../petstore_api/models/object_with_deprecated_fields.py | 3 +-- .../petstore_api/models/one_of_enum_string.py | 2 +- .../petstore/python-aiohttp/petstore_api/models/order.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/other.py | 3 +-- .../python-aiohttp/petstore_api/models/outer_composite.py | 3 +-- .../python-aiohttp/petstore_api/models/outer_enum.py | 2 +- .../petstore_api/models/outer_enum_default_value.py | 2 +- .../petstore_api/models/outer_enum_integer.py | 2 +- .../petstore_api/models/outer_enum_integer_default_value.py | 2 +- .../petstore_api/models/outer_object_with_enum_property.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/parent.py | 3 +-- .../petstore_api/models/parent_with_optional_dict.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/pet.py | 6 ++---- .../petstore/python-aiohttp/petstore_api/models/pig.py | 3 +-- .../python-aiohttp/petstore_api/models/pony_sizes.py | 3 +-- .../python-aiohttp/petstore_api/models/poop_cleaning.py | 3 +-- .../python-aiohttp/petstore_api/models/primitive_string.py | 3 +-- .../python-aiohttp/petstore_api/models/property_map.py | 3 +-- .../petstore_api/models/property_name_collision.py | 3 +-- .../python-aiohttp/petstore_api/models/read_only_first.py | 3 +-- .../petstore_api/models/second_circular_all_of_ref.py | 3 +-- .../python-aiohttp/petstore_api/models/second_ref.py | 3 +-- .../petstore_api/models/self_reference_model.py | 3 +-- .../python-aiohttp/petstore_api/models/single_ref_type.py | 2 +- .../petstore_api/models/special_character_enum.py | 2 +- .../petstore_api/models/special_model_name.py | 3 +-- .../python-aiohttp/petstore_api/models/special_name.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/tag.py | 3 +-- .../python-aiohttp/petstore_api/models/tagged_union.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/task.py | 3 +-- .../python-aiohttp/petstore_api/models/task_activity.py | 3 +-- .../python-aiohttp/petstore_api/models/test_enum.py | 2 +- .../petstore_api/models/test_enum_with_default.py | 2 +- .../models/test_error_responses_with_model400_response.py | 3 +-- .../models/test_error_responses_with_model404_response.py | 3 +-- .../test_inline_freeform_additional_properties_request.py | 3 +-- .../petstore_api/models/test_model_with_enum_default.py | 3 +-- .../test_object_for_multipart_requests_request_marker.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/tiger.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/type.py | 2 +- .../unnamed_dict_with_additional_model_list_properties.py | 3 +-- .../unnamed_dict_with_additional_string_list_properties.py | 3 +-- ...upload_file_with_additional_properties_request_object.py | 3 +-- .../petstore/python-aiohttp/petstore_api/models/user.py | 3 +-- .../python-aiohttp/petstore_api/models/uuid_with_pattern.py | 3 +-- .../petstore_api/models/with_nested_one_of.py | 3 +-- .../openapi3/client/petstore/python-aiohttp/pyproject.toml | 1 - .../client/petstore/python-aiohttp/requirements.txt | 1 - samples/openapi3/client/petstore/python-aiohttp/setup.py | 1 - .../python-httpx-sync/petstore_api/api/another_fake_api.py | 5 ++--- .../python-httpx-sync/petstore_api/api/default_api.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/api/fake_api.py | 6 ++---- .../petstore_api/api/fake_classname_tags123_api.py | 5 ++--- .../petstore_api/api/import_test_datetime_api.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/api/pet_api.py | 6 ++---- .../python-httpx-sync/petstore_api/api/store_api.py | 6 ++---- .../petstore/python-httpx-sync/petstore_api/api/user_api.py | 6 ++---- .../python-httpx-sync/petstore_api/configuration.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/exceptions.py | 3 +-- .../petstore_api/models/additional_properties_any_type.py | 3 +-- .../petstore_api/models/additional_properties_class.py | 3 +-- .../petstore_api/models/additional_properties_object.py | 3 +-- .../models/additional_properties_with_description_only.py | 3 +-- .../petstore_api/models/all_of_super_model.py | 3 +-- .../petstore_api/models/all_of_with_single_ref.py | 3 +-- .../python-httpx-sync/petstore_api/models/animal.py | 3 +-- .../python-httpx-sync/petstore_api/models/any_of_color.py | 6 ++---- .../python-httpx-sync/petstore_api/models/any_of_pig.py | 3 +-- .../petstore_api/models/array_of_array_of_model.py | 3 +-- .../petstore_api/models/array_of_array_of_number_only.py | 3 +-- .../petstore_api/models/array_of_map_model.py | 3 +-- .../petstore_api/models/array_of_number_only.py | 3 +-- .../python-httpx-sync/petstore_api/models/array_test.py | 6 ++---- .../petstore_api/models/base_discriminator.py | 3 +-- .../python-httpx-sync/petstore_api/models/basque_pig.py | 3 +-- .../python-httpx-sync/petstore_api/models/bathing.py | 3 +-- .../python-httpx-sync/petstore_api/models/capitalization.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/cat.py | 3 +-- .../python-httpx-sync/petstore_api/models/category.py | 3 +-- .../petstore_api/models/circular_all_of_ref.py | 3 +-- .../petstore_api/models/circular_reference_model.py | 3 +-- .../python-httpx-sync/petstore_api/models/class_model.py | 3 +-- .../python-httpx-sync/petstore_api/models/client.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/color.py | 6 ++---- .../python-httpx-sync/petstore_api/models/creature.py | 3 +-- .../python-httpx-sync/petstore_api/models/creature_info.py | 3 +-- .../python-httpx-sync/petstore_api/models/danish_pig.py | 3 +-- .../petstore_api/models/data_output_format.py | 2 +- .../petstore_api/models/deprecated_object.py | 3 +-- .../petstore_api/models/discriminator_all_of_sub.py | 3 +-- .../petstore_api/models/discriminator_all_of_super.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/dog.py | 3 +-- .../python-httpx-sync/petstore_api/models/dummy_model.py | 3 +-- .../python-httpx-sync/petstore_api/models/enum_arrays.py | 3 +-- .../python-httpx-sync/petstore_api/models/enum_class.py | 2 +- .../petstore_api/models/enum_number_vendor_ext.py | 2 +- .../petstore_api/models/enum_ref_with_default_value.py | 3 +-- .../python-httpx-sync/petstore_api/models/enum_string1.py | 2 +- .../python-httpx-sync/petstore_api/models/enum_string2.py | 2 +- .../petstore_api/models/enum_string_vendor_ext.py | 2 +- .../python-httpx-sync/petstore_api/models/enum_test.py | 3 +-- .../python-httpx-sync/petstore_api/models/feeding.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/file.py | 3 +-- .../petstore_api/models/file_schema_test_class.py | 3 +-- .../python-httpx-sync/petstore_api/models/first_ref.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/foo.py | 3 +-- .../petstore_api/models/foo_get_default_response.py | 3 +-- .../python-httpx-sync/petstore_api/models/format_test.py | 6 ++---- .../petstore_api/models/has_only_read_only.py | 3 +-- .../python-httpx-sync/petstore_api/models/header_arg.py | 3 +-- .../petstore_api/models/health_check_result.py | 3 +-- .../python-httpx-sync/petstore_api/models/hunting_dog.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/info.py | 3 +-- .../petstore_api/models/inner_dict_with_property.py | 3 +-- .../python-httpx-sync/petstore_api/models/input_all_of.py | 3 +-- .../python-httpx-sync/petstore_api/models/int_or_string.py | 6 ++---- .../petstore/python-httpx-sync/petstore_api/models/known.py | 3 +-- .../python-httpx-sync/petstore_api/models/list_class.py | 3 +-- .../petstore_api/models/map_of_array_of_model.py | 3 +-- .../python-httpx-sync/petstore_api/models/map_test.py | 3 +-- .../mixed_properties_and_additional_properties_class.py | 3 +-- .../petstore_api/models/model200_response.py | 3 +-- .../petstore_api/models/model_api_response.py | 3 +-- .../python-httpx-sync/petstore_api/models/model_field.py | 3 +-- .../python-httpx-sync/petstore_api/models/model_return.py | 3 +-- .../python-httpx-sync/petstore_api/models/multi_arrays.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/name.py | 3 +-- .../python-httpx-sync/petstore_api/models/nullable_class.py | 3 +-- .../petstore_api/models/nullable_property.py | 6 ++---- .../python-httpx-sync/petstore_api/models/number_only.py | 3 +-- .../models/object_to_test_additional_properties.py | 3 +-- .../petstore_api/models/object_with_deprecated_fields.py | 3 +-- .../petstore_api/models/one_of_enum_string.py | 2 +- .../petstore/python-httpx-sync/petstore_api/models/order.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/other.py | 3 +-- .../petstore_api/models/outer_composite.py | 3 +-- .../python-httpx-sync/petstore_api/models/outer_enum.py | 2 +- .../petstore_api/models/outer_enum_default_value.py | 2 +- .../petstore_api/models/outer_enum_integer.py | 2 +- .../petstore_api/models/outer_enum_integer_default_value.py | 2 +- .../petstore_api/models/outer_object_with_enum_property.py | 3 +-- .../python-httpx-sync/petstore_api/models/parent.py | 3 +-- .../petstore_api/models/parent_with_optional_dict.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/pet.py | 6 ++---- .../petstore/python-httpx-sync/petstore_api/models/pig.py | 3 +-- .../python-httpx-sync/petstore_api/models/pony_sizes.py | 3 +-- .../python-httpx-sync/petstore_api/models/poop_cleaning.py | 3 +-- .../petstore_api/models/primitive_string.py | 3 +-- .../python-httpx-sync/petstore_api/models/property_map.py | 3 +-- .../petstore_api/models/property_name_collision.py | 3 +-- .../petstore_api/models/read_only_first.py | 3 +-- .../petstore_api/models/second_circular_all_of_ref.py | 3 +-- .../python-httpx-sync/petstore_api/models/second_ref.py | 3 +-- .../petstore_api/models/self_reference_model.py | 3 +-- .../petstore_api/models/single_ref_type.py | 2 +- .../petstore_api/models/special_character_enum.py | 2 +- .../petstore_api/models/special_model_name.py | 3 +-- .../python-httpx-sync/petstore_api/models/special_name.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/tag.py | 3 +-- .../python-httpx-sync/petstore_api/models/tagged_union.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/task.py | 3 +-- .../python-httpx-sync/petstore_api/models/task_activity.py | 3 +-- .../python-httpx-sync/petstore_api/models/test_enum.py | 2 +- .../petstore_api/models/test_enum_with_default.py | 2 +- .../models/test_error_responses_with_model400_response.py | 3 +-- .../models/test_error_responses_with_model404_response.py | 3 +-- .../test_inline_freeform_additional_properties_request.py | 3 +-- .../petstore_api/models/test_model_with_enum_default.py | 3 +-- .../test_object_for_multipart_requests_request_marker.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/tiger.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/type.py | 2 +- .../unnamed_dict_with_additional_model_list_properties.py | 3 +-- .../unnamed_dict_with_additional_string_list_properties.py | 3 +-- ...upload_file_with_additional_properties_request_object.py | 3 +-- .../petstore/python-httpx-sync/petstore_api/models/user.py | 3 +-- .../petstore_api/models/uuid_with_pattern.py | 3 +-- .../petstore_api/models/with_nested_one_of.py | 3 +-- .../client/petstore/python-httpx-sync/pyproject.toml | 1 - .../client/petstore/python-httpx-sync/requirements.txt | 1 - samples/openapi3/client/petstore/python-httpx-sync/setup.py | 1 - .../python-httpx/petstore_api/api/another_fake_api.py | 5 ++--- .../petstore/python-httpx/petstore_api/api/default_api.py | 3 +-- .../petstore/python-httpx/petstore_api/api/fake_api.py | 6 ++---- .../petstore_api/api/fake_classname_tags123_api.py | 5 ++--- .../petstore_api/api/import_test_datetime_api.py | 3 +-- .../petstore/python-httpx/petstore_api/api/pet_api.py | 6 ++---- .../petstore/python-httpx/petstore_api/api/store_api.py | 6 ++---- .../petstore/python-httpx/petstore_api/api/user_api.py | 6 ++---- .../petstore/python-httpx/petstore_api/configuration.py | 3 +-- .../client/petstore/python-httpx/petstore_api/exceptions.py | 3 +-- .../petstore_api/models/additional_properties_any_type.py | 3 +-- .../petstore_api/models/additional_properties_class.py | 3 +-- .../petstore_api/models/additional_properties_object.py | 3 +-- .../models/additional_properties_with_description_only.py | 3 +-- .../python-httpx/petstore_api/models/all_of_super_model.py | 3 +-- .../petstore_api/models/all_of_with_single_ref.py | 3 +-- .../petstore/python-httpx/petstore_api/models/animal.py | 3 +-- .../python-httpx/petstore_api/models/any_of_color.py | 6 ++---- .../petstore/python-httpx/petstore_api/models/any_of_pig.py | 3 +-- .../petstore_api/models/array_of_array_of_model.py | 3 +-- .../petstore_api/models/array_of_array_of_number_only.py | 3 +-- .../python-httpx/petstore_api/models/array_of_map_model.py | 3 +-- .../petstore_api/models/array_of_number_only.py | 3 +-- .../petstore/python-httpx/petstore_api/models/array_test.py | 6 ++---- .../python-httpx/petstore_api/models/base_discriminator.py | 3 +-- .../petstore/python-httpx/petstore_api/models/basque_pig.py | 3 +-- .../petstore/python-httpx/petstore_api/models/bathing.py | 3 +-- .../python-httpx/petstore_api/models/capitalization.py | 3 +-- .../client/petstore/python-httpx/petstore_api/models/cat.py | 3 +-- .../petstore/python-httpx/petstore_api/models/category.py | 3 +-- .../python-httpx/petstore_api/models/circular_all_of_ref.py | 3 +-- .../petstore_api/models/circular_reference_model.py | 3 +-- .../python-httpx/petstore_api/models/class_model.py | 3 +-- .../petstore/python-httpx/petstore_api/models/client.py | 3 +-- .../petstore/python-httpx/petstore_api/models/color.py | 6 ++---- .../petstore/python-httpx/petstore_api/models/creature.py | 3 +-- .../python-httpx/petstore_api/models/creature_info.py | 3 +-- .../petstore/python-httpx/petstore_api/models/danish_pig.py | 3 +-- .../python-httpx/petstore_api/models/data_output_format.py | 2 +- .../python-httpx/petstore_api/models/deprecated_object.py | 3 +-- .../petstore_api/models/discriminator_all_of_sub.py | 3 +-- .../petstore_api/models/discriminator_all_of_super.py | 3 +-- .../client/petstore/python-httpx/petstore_api/models/dog.py | 3 +-- .../python-httpx/petstore_api/models/dummy_model.py | 3 +-- .../python-httpx/petstore_api/models/enum_arrays.py | 3 +-- .../petstore/python-httpx/petstore_api/models/enum_class.py | 2 +- .../petstore_api/models/enum_number_vendor_ext.py | 2 +- .../petstore_api/models/enum_ref_with_default_value.py | 3 +-- .../python-httpx/petstore_api/models/enum_string1.py | 2 +- .../python-httpx/petstore_api/models/enum_string2.py | 2 +- .../petstore_api/models/enum_string_vendor_ext.py | 2 +- .../petstore/python-httpx/petstore_api/models/enum_test.py | 3 +-- .../petstore/python-httpx/petstore_api/models/feeding.py | 3 +-- .../petstore/python-httpx/petstore_api/models/file.py | 3 +-- .../petstore_api/models/file_schema_test_class.py | 3 +-- .../petstore/python-httpx/petstore_api/models/first_ref.py | 3 +-- .../client/petstore/python-httpx/petstore_api/models/foo.py | 3 +-- .../petstore_api/models/foo_get_default_response.py | 3 +-- .../python-httpx/petstore_api/models/format_test.py | 6 ++---- .../python-httpx/petstore_api/models/has_only_read_only.py | 3 +-- .../petstore/python-httpx/petstore_api/models/header_arg.py | 3 +-- .../python-httpx/petstore_api/models/health_check_result.py | 3 +-- .../python-httpx/petstore_api/models/hunting_dog.py | 3 +-- .../petstore/python-httpx/petstore_api/models/info.py | 3 +-- .../petstore_api/models/inner_dict_with_property.py | 3 +-- .../python-httpx/petstore_api/models/input_all_of.py | 3 +-- .../python-httpx/petstore_api/models/int_or_string.py | 6 ++---- .../petstore/python-httpx/petstore_api/models/known.py | 3 +-- .../petstore/python-httpx/petstore_api/models/list_class.py | 3 +-- .../petstore_api/models/map_of_array_of_model.py | 3 +-- .../petstore/python-httpx/petstore_api/models/map_test.py | 3 +-- .../mixed_properties_and_additional_properties_class.py | 3 +-- .../python-httpx/petstore_api/models/model200_response.py | 3 +-- .../python-httpx/petstore_api/models/model_api_response.py | 3 +-- .../python-httpx/petstore_api/models/model_field.py | 3 +-- .../python-httpx/petstore_api/models/model_return.py | 3 +-- .../python-httpx/petstore_api/models/multi_arrays.py | 3 +-- .../petstore/python-httpx/petstore_api/models/name.py | 3 +-- .../python-httpx/petstore_api/models/nullable_class.py | 3 +-- .../python-httpx/petstore_api/models/nullable_property.py | 6 ++---- .../python-httpx/petstore_api/models/number_only.py | 3 +-- .../models/object_to_test_additional_properties.py | 3 +-- .../petstore_api/models/object_with_deprecated_fields.py | 3 +-- .../python-httpx/petstore_api/models/one_of_enum_string.py | 2 +- .../petstore/python-httpx/petstore_api/models/order.py | 3 +-- .../petstore/python-httpx/petstore_api/models/other.py | 3 +-- .../python-httpx/petstore_api/models/outer_composite.py | 3 +-- .../petstore/python-httpx/petstore_api/models/outer_enum.py | 2 +- .../petstore_api/models/outer_enum_default_value.py | 2 +- .../python-httpx/petstore_api/models/outer_enum_integer.py | 2 +- .../petstore_api/models/outer_enum_integer_default_value.py | 2 +- .../petstore_api/models/outer_object_with_enum_property.py | 3 +-- .../petstore/python-httpx/petstore_api/models/parent.py | 3 +-- .../petstore_api/models/parent_with_optional_dict.py | 3 +-- .../client/petstore/python-httpx/petstore_api/models/pet.py | 6 ++---- .../client/petstore/python-httpx/petstore_api/models/pig.py | 3 +-- .../petstore/python-httpx/petstore_api/models/pony_sizes.py | 3 +-- .../python-httpx/petstore_api/models/poop_cleaning.py | 3 +-- .../python-httpx/petstore_api/models/primitive_string.py | 3 +-- .../python-httpx/petstore_api/models/property_map.py | 3 +-- .../petstore_api/models/property_name_collision.py | 3 +-- .../python-httpx/petstore_api/models/read_only_first.py | 3 +-- .../petstore_api/models/second_circular_all_of_ref.py | 3 +-- .../petstore/python-httpx/petstore_api/models/second_ref.py | 3 +-- .../petstore_api/models/self_reference_model.py | 3 +-- .../python-httpx/petstore_api/models/single_ref_type.py | 2 +- .../petstore_api/models/special_character_enum.py | 2 +- .../python-httpx/petstore_api/models/special_model_name.py | 3 +-- .../python-httpx/petstore_api/models/special_name.py | 3 +-- .../client/petstore/python-httpx/petstore_api/models/tag.py | 3 +-- .../python-httpx/petstore_api/models/tagged_union.py | 3 +-- .../petstore/python-httpx/petstore_api/models/task.py | 3 +-- .../python-httpx/petstore_api/models/task_activity.py | 3 +-- .../petstore/python-httpx/petstore_api/models/test_enum.py | 2 +- .../petstore_api/models/test_enum_with_default.py | 2 +- .../models/test_error_responses_with_model400_response.py | 3 +-- .../models/test_error_responses_with_model404_response.py | 3 +-- .../test_inline_freeform_additional_properties_request.py | 3 +-- .../petstore_api/models/test_model_with_enum_default.py | 3 +-- .../test_object_for_multipart_requests_request_marker.py | 3 +-- .../petstore/python-httpx/petstore_api/models/tiger.py | 3 +-- .../petstore/python-httpx/petstore_api/models/type.py | 2 +- .../unnamed_dict_with_additional_model_list_properties.py | 3 +-- .../unnamed_dict_with_additional_string_list_properties.py | 3 +-- ...upload_file_with_additional_properties_request_object.py | 3 +-- .../petstore/python-httpx/petstore_api/models/user.py | 3 +-- .../python-httpx/petstore_api/models/uuid_with_pattern.py | 3 +-- .../python-httpx/petstore_api/models/with_nested_one_of.py | 3 +-- .../openapi3/client/petstore/python-httpx/pyproject.toml | 1 - .../openapi3/client/petstore/python-httpx/requirements.txt | 1 - samples/openapi3/client/petstore/python-httpx/setup.py | 1 - .../python-httpx2-sync/petstore_api/api/another_fake_api.py | 5 ++--- .../python-httpx2-sync/petstore_api/api/default_api.py | 3 +-- .../python-httpx2-sync/petstore_api/api/fake_api.py | 6 ++---- .../petstore_api/api/fake_classname_tags123_api.py | 5 ++--- .../petstore_api/api/import_test_datetime_api.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/api/pet_api.py | 6 ++---- .../python-httpx2-sync/petstore_api/api/store_api.py | 6 ++---- .../python-httpx2-sync/petstore_api/api/user_api.py | 6 ++---- .../python-httpx2-sync/petstore_api/configuration.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/exceptions.py | 3 +-- .../petstore_api/models/additional_properties_any_type.py | 3 +-- .../petstore_api/models/additional_properties_class.py | 3 +-- .../petstore_api/models/additional_properties_object.py | 3 +-- .../models/additional_properties_with_description_only.py | 3 +-- .../petstore_api/models/all_of_super_model.py | 3 +-- .../petstore_api/models/all_of_with_single_ref.py | 3 +-- .../python-httpx2-sync/petstore_api/models/animal.py | 3 +-- .../python-httpx2-sync/petstore_api/models/any_of_color.py | 6 ++---- .../python-httpx2-sync/petstore_api/models/any_of_pig.py | 3 +-- .../petstore_api/models/array_of_array_of_model.py | 3 +-- .../petstore_api/models/array_of_array_of_number_only.py | 3 +-- .../petstore_api/models/array_of_map_model.py | 3 +-- .../petstore_api/models/array_of_number_only.py | 3 +-- .../python-httpx2-sync/petstore_api/models/array_test.py | 6 ++---- .../petstore_api/models/base_discriminator.py | 3 +-- .../python-httpx2-sync/petstore_api/models/basque_pig.py | 3 +-- .../python-httpx2-sync/petstore_api/models/bathing.py | 3 +-- .../petstore_api/models/capitalization.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/cat.py | 3 +-- .../python-httpx2-sync/petstore_api/models/category.py | 3 +-- .../petstore_api/models/circular_all_of_ref.py | 3 +-- .../petstore_api/models/circular_reference_model.py | 3 +-- .../python-httpx2-sync/petstore_api/models/class_model.py | 3 +-- .../python-httpx2-sync/petstore_api/models/client.py | 3 +-- .../python-httpx2-sync/petstore_api/models/color.py | 6 ++---- .../python-httpx2-sync/petstore_api/models/creature.py | 3 +-- .../python-httpx2-sync/petstore_api/models/creature_info.py | 3 +-- .../python-httpx2-sync/petstore_api/models/danish_pig.py | 3 +-- .../petstore_api/models/data_output_format.py | 2 +- .../petstore_api/models/deprecated_object.py | 3 +-- .../petstore_api/models/discriminator_all_of_sub.py | 3 +-- .../petstore_api/models/discriminator_all_of_super.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/dog.py | 3 +-- .../python-httpx2-sync/petstore_api/models/dummy_model.py | 3 +-- .../python-httpx2-sync/petstore_api/models/enum_arrays.py | 3 +-- .../python-httpx2-sync/petstore_api/models/enum_class.py | 2 +- .../petstore_api/models/enum_number_vendor_ext.py | 2 +- .../petstore_api/models/enum_ref_with_default_value.py | 3 +-- .../python-httpx2-sync/petstore_api/models/enum_string1.py | 2 +- .../python-httpx2-sync/petstore_api/models/enum_string2.py | 2 +- .../petstore_api/models/enum_string_vendor_ext.py | 2 +- .../python-httpx2-sync/petstore_api/models/enum_test.py | 3 +-- .../python-httpx2-sync/petstore_api/models/feeding.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/file.py | 3 +-- .../petstore_api/models/file_schema_test_class.py | 3 +-- .../python-httpx2-sync/petstore_api/models/first_ref.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/foo.py | 3 +-- .../petstore_api/models/foo_get_default_response.py | 3 +-- .../python-httpx2-sync/petstore_api/models/format_test.py | 6 ++---- .../petstore_api/models/has_only_read_only.py | 3 +-- .../python-httpx2-sync/petstore_api/models/header_arg.py | 3 +-- .../petstore_api/models/health_check_result.py | 3 +-- .../python-httpx2-sync/petstore_api/models/hunting_dog.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/info.py | 3 +-- .../petstore_api/models/inner_dict_with_property.py | 3 +-- .../python-httpx2-sync/petstore_api/models/input_all_of.py | 3 +-- .../python-httpx2-sync/petstore_api/models/int_or_string.py | 6 ++---- .../python-httpx2-sync/petstore_api/models/known.py | 3 +-- .../python-httpx2-sync/petstore_api/models/list_class.py | 3 +-- .../petstore_api/models/map_of_array_of_model.py | 3 +-- .../python-httpx2-sync/petstore_api/models/map_test.py | 3 +-- .../mixed_properties_and_additional_properties_class.py | 3 +-- .../petstore_api/models/model200_response.py | 3 +-- .../petstore_api/models/model_api_response.py | 3 +-- .../python-httpx2-sync/petstore_api/models/model_field.py | 3 +-- .../python-httpx2-sync/petstore_api/models/model_return.py | 3 +-- .../python-httpx2-sync/petstore_api/models/multi_arrays.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/name.py | 3 +-- .../petstore_api/models/nullable_class.py | 3 +-- .../petstore_api/models/nullable_property.py | 6 ++---- .../python-httpx2-sync/petstore_api/models/number_only.py | 3 +-- .../models/object_to_test_additional_properties.py | 3 +-- .../petstore_api/models/object_with_deprecated_fields.py | 3 +-- .../petstore_api/models/one_of_enum_string.py | 2 +- .../python-httpx2-sync/petstore_api/models/order.py | 3 +-- .../python-httpx2-sync/petstore_api/models/other.py | 3 +-- .../petstore_api/models/outer_composite.py | 3 +-- .../python-httpx2-sync/petstore_api/models/outer_enum.py | 2 +- .../petstore_api/models/outer_enum_default_value.py | 2 +- .../petstore_api/models/outer_enum_integer.py | 2 +- .../petstore_api/models/outer_enum_integer_default_value.py | 2 +- .../petstore_api/models/outer_object_with_enum_property.py | 3 +-- .../python-httpx2-sync/petstore_api/models/parent.py | 3 +-- .../petstore_api/models/parent_with_optional_dict.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/pet.py | 6 ++---- .../petstore/python-httpx2-sync/petstore_api/models/pig.py | 3 +-- .../python-httpx2-sync/petstore_api/models/pony_sizes.py | 3 +-- .../python-httpx2-sync/petstore_api/models/poop_cleaning.py | 3 +-- .../petstore_api/models/primitive_string.py | 3 +-- .../python-httpx2-sync/petstore_api/models/property_map.py | 3 +-- .../petstore_api/models/property_name_collision.py | 3 +-- .../petstore_api/models/read_only_first.py | 3 +-- .../petstore_api/models/second_circular_all_of_ref.py | 3 +-- .../python-httpx2-sync/petstore_api/models/second_ref.py | 3 +-- .../petstore_api/models/self_reference_model.py | 3 +-- .../petstore_api/models/single_ref_type.py | 2 +- .../petstore_api/models/special_character_enum.py | 2 +- .../petstore_api/models/special_model_name.py | 3 +-- .../python-httpx2-sync/petstore_api/models/special_name.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/tag.py | 3 +-- .../python-httpx2-sync/petstore_api/models/tagged_union.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/task.py | 3 +-- .../python-httpx2-sync/petstore_api/models/task_activity.py | 3 +-- .../python-httpx2-sync/petstore_api/models/test_enum.py | 2 +- .../petstore_api/models/test_enum_with_default.py | 2 +- .../models/test_error_responses_with_model400_response.py | 3 +-- .../models/test_error_responses_with_model404_response.py | 3 +-- .../test_inline_freeform_additional_properties_request.py | 3 +-- .../petstore_api/models/test_model_with_enum_default.py | 3 +-- .../test_object_for_multipart_requests_request_marker.py | 3 +-- .../python-httpx2-sync/petstore_api/models/tiger.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/type.py | 2 +- .../unnamed_dict_with_additional_model_list_properties.py | 3 +-- .../unnamed_dict_with_additional_string_list_properties.py | 3 +-- ...upload_file_with_additional_properties_request_object.py | 3 +-- .../petstore/python-httpx2-sync/petstore_api/models/user.py | 3 +-- .../petstore_api/models/uuid_with_pattern.py | 3 +-- .../petstore_api/models/with_nested_one_of.py | 3 +-- .../client/petstore/python-httpx2-sync/pyproject.toml | 1 - .../client/petstore/python-httpx2-sync/requirements.txt | 1 - .../openapi3/client/petstore/python-httpx2-sync/setup.py | 1 - .../python-httpx2/petstore_api/api/another_fake_api.py | 5 ++--- .../petstore/python-httpx2/petstore_api/api/default_api.py | 3 +-- .../petstore/python-httpx2/petstore_api/api/fake_api.py | 6 ++---- .../petstore_api/api/fake_classname_tags123_api.py | 5 ++--- .../petstore_api/api/import_test_datetime_api.py | 3 +-- .../petstore/python-httpx2/petstore_api/api/pet_api.py | 6 ++---- .../petstore/python-httpx2/petstore_api/api/store_api.py | 6 ++---- .../petstore/python-httpx2/petstore_api/api/user_api.py | 6 ++---- .../petstore/python-httpx2/petstore_api/configuration.py | 3 +-- .../petstore/python-httpx2/petstore_api/exceptions.py | 3 +-- .../petstore_api/models/additional_properties_any_type.py | 3 +-- .../petstore_api/models/additional_properties_class.py | 3 +-- .../petstore_api/models/additional_properties_object.py | 3 +-- .../models/additional_properties_with_description_only.py | 3 +-- .../python-httpx2/petstore_api/models/all_of_super_model.py | 3 +-- .../petstore_api/models/all_of_with_single_ref.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/animal.py | 3 +-- .../python-httpx2/petstore_api/models/any_of_color.py | 6 ++---- .../python-httpx2/petstore_api/models/any_of_pig.py | 3 +-- .../petstore_api/models/array_of_array_of_model.py | 3 +-- .../petstore_api/models/array_of_array_of_number_only.py | 3 +-- .../python-httpx2/petstore_api/models/array_of_map_model.py | 3 +-- .../petstore_api/models/array_of_number_only.py | 3 +-- .../python-httpx2/petstore_api/models/array_test.py | 6 ++---- .../python-httpx2/petstore_api/models/base_discriminator.py | 3 +-- .../python-httpx2/petstore_api/models/basque_pig.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/bathing.py | 3 +-- .../python-httpx2/petstore_api/models/capitalization.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/cat.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/category.py | 3 +-- .../petstore_api/models/circular_all_of_ref.py | 3 +-- .../petstore_api/models/circular_reference_model.py | 3 +-- .../python-httpx2/petstore_api/models/class_model.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/client.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/color.py | 6 ++---- .../petstore/python-httpx2/petstore_api/models/creature.py | 3 +-- .../python-httpx2/petstore_api/models/creature_info.py | 3 +-- .../python-httpx2/petstore_api/models/danish_pig.py | 3 +-- .../python-httpx2/petstore_api/models/data_output_format.py | 2 +- .../python-httpx2/petstore_api/models/deprecated_object.py | 3 +-- .../petstore_api/models/discriminator_all_of_sub.py | 3 +-- .../petstore_api/models/discriminator_all_of_super.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/dog.py | 3 +-- .../python-httpx2/petstore_api/models/dummy_model.py | 3 +-- .../python-httpx2/petstore_api/models/enum_arrays.py | 3 +-- .../python-httpx2/petstore_api/models/enum_class.py | 2 +- .../petstore_api/models/enum_number_vendor_ext.py | 2 +- .../petstore_api/models/enum_ref_with_default_value.py | 3 +-- .../python-httpx2/petstore_api/models/enum_string1.py | 2 +- .../python-httpx2/petstore_api/models/enum_string2.py | 2 +- .../petstore_api/models/enum_string_vendor_ext.py | 2 +- .../petstore/python-httpx2/petstore_api/models/enum_test.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/feeding.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/file.py | 3 +-- .../petstore_api/models/file_schema_test_class.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/first_ref.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/foo.py | 3 +-- .../petstore_api/models/foo_get_default_response.py | 3 +-- .../python-httpx2/petstore_api/models/format_test.py | 6 ++---- .../python-httpx2/petstore_api/models/has_only_read_only.py | 3 +-- .../python-httpx2/petstore_api/models/header_arg.py | 3 +-- .../petstore_api/models/health_check_result.py | 3 +-- .../python-httpx2/petstore_api/models/hunting_dog.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/info.py | 3 +-- .../petstore_api/models/inner_dict_with_property.py | 3 +-- .../python-httpx2/petstore_api/models/input_all_of.py | 3 +-- .../python-httpx2/petstore_api/models/int_or_string.py | 6 ++---- .../petstore/python-httpx2/petstore_api/models/known.py | 3 +-- .../python-httpx2/petstore_api/models/list_class.py | 3 +-- .../petstore_api/models/map_of_array_of_model.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/map_test.py | 3 +-- .../mixed_properties_and_additional_properties_class.py | 3 +-- .../python-httpx2/petstore_api/models/model200_response.py | 3 +-- .../python-httpx2/petstore_api/models/model_api_response.py | 3 +-- .../python-httpx2/petstore_api/models/model_field.py | 3 +-- .../python-httpx2/petstore_api/models/model_return.py | 3 +-- .../python-httpx2/petstore_api/models/multi_arrays.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/name.py | 3 +-- .../python-httpx2/petstore_api/models/nullable_class.py | 3 +-- .../python-httpx2/petstore_api/models/nullable_property.py | 6 ++---- .../python-httpx2/petstore_api/models/number_only.py | 3 +-- .../models/object_to_test_additional_properties.py | 3 +-- .../petstore_api/models/object_with_deprecated_fields.py | 3 +-- .../python-httpx2/petstore_api/models/one_of_enum_string.py | 2 +- .../petstore/python-httpx2/petstore_api/models/order.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/other.py | 3 +-- .../python-httpx2/petstore_api/models/outer_composite.py | 3 +-- .../python-httpx2/petstore_api/models/outer_enum.py | 2 +- .../petstore_api/models/outer_enum_default_value.py | 2 +- .../python-httpx2/petstore_api/models/outer_enum_integer.py | 2 +- .../petstore_api/models/outer_enum_integer_default_value.py | 2 +- .../petstore_api/models/outer_object_with_enum_property.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/parent.py | 3 +-- .../petstore_api/models/parent_with_optional_dict.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/pet.py | 6 ++---- .../petstore/python-httpx2/petstore_api/models/pig.py | 3 +-- .../python-httpx2/petstore_api/models/pony_sizes.py | 3 +-- .../python-httpx2/petstore_api/models/poop_cleaning.py | 3 +-- .../python-httpx2/petstore_api/models/primitive_string.py | 3 +-- .../python-httpx2/petstore_api/models/property_map.py | 3 +-- .../petstore_api/models/property_name_collision.py | 3 +-- .../python-httpx2/petstore_api/models/read_only_first.py | 3 +-- .../petstore_api/models/second_circular_all_of_ref.py | 3 +-- .../python-httpx2/petstore_api/models/second_ref.py | 3 +-- .../petstore_api/models/self_reference_model.py | 3 +-- .../python-httpx2/petstore_api/models/single_ref_type.py | 2 +- .../petstore_api/models/special_character_enum.py | 2 +- .../python-httpx2/petstore_api/models/special_model_name.py | 3 +-- .../python-httpx2/petstore_api/models/special_name.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/tag.py | 3 +-- .../python-httpx2/petstore_api/models/tagged_union.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/task.py | 3 +-- .../python-httpx2/petstore_api/models/task_activity.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/test_enum.py | 2 +- .../petstore_api/models/test_enum_with_default.py | 2 +- .../models/test_error_responses_with_model400_response.py | 3 +-- .../models/test_error_responses_with_model404_response.py | 3 +-- .../test_inline_freeform_additional_properties_request.py | 3 +-- .../petstore_api/models/test_model_with_enum_default.py | 3 +-- .../test_object_for_multipart_requests_request_marker.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/tiger.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/type.py | 2 +- .../unnamed_dict_with_additional_model_list_properties.py | 3 +-- .../unnamed_dict_with_additional_string_list_properties.py | 3 +-- ...upload_file_with_additional_properties_request_object.py | 3 +-- .../petstore/python-httpx2/petstore_api/models/user.py | 3 +-- .../python-httpx2/petstore_api/models/uuid_with_pattern.py | 3 +-- .../python-httpx2/petstore_api/models/with_nested_one_of.py | 3 +-- .../openapi3/client/petstore/python-httpx2/pyproject.toml | 1 - .../openapi3/client/petstore/python-httpx2/requirements.txt | 1 - samples/openapi3/client/petstore/python-httpx2/setup.py | 1 - .../python-lazyImports/petstore_api/api/another_fake_api.py | 5 ++--- .../python-lazyImports/petstore_api/api/default_api.py | 3 +-- .../python-lazyImports/petstore_api/api/fake_api.py | 6 ++---- .../petstore_api/api/fake_classname_tags123_api.py | 5 ++--- .../petstore_api/api/import_test_datetime_api.py | 3 +-- .../petstore/python-lazyImports/petstore_api/api/pet_api.py | 6 ++---- .../python-lazyImports/petstore_api/api/store_api.py | 6 ++---- .../python-lazyImports/petstore_api/api/user_api.py | 6 ++---- .../python-lazyImports/petstore_api/configuration.py | 3 +-- .../petstore/python-lazyImports/petstore_api/exceptions.py | 3 +-- .../petstore_api/models/additional_properties_any_type.py | 3 +-- .../petstore_api/models/additional_properties_class.py | 3 +-- .../petstore_api/models/additional_properties_object.py | 3 +-- .../models/additional_properties_with_description_only.py | 3 +-- .../petstore_api/models/all_of_super_model.py | 3 +-- .../petstore_api/models/all_of_with_single_ref.py | 3 +-- .../python-lazyImports/petstore_api/models/animal.py | 3 +-- .../python-lazyImports/petstore_api/models/any_of_color.py | 6 ++---- .../python-lazyImports/petstore_api/models/any_of_pig.py | 3 +-- .../petstore_api/models/array_of_array_of_model.py | 3 +-- .../petstore_api/models/array_of_array_of_number_only.py | 3 +-- .../petstore_api/models/array_of_map_model.py | 3 +-- .../petstore_api/models/array_of_number_only.py | 3 +-- .../python-lazyImports/petstore_api/models/array_test.py | 6 ++---- .../petstore_api/models/base_discriminator.py | 3 +-- .../python-lazyImports/petstore_api/models/basque_pig.py | 3 +-- .../python-lazyImports/petstore_api/models/bathing.py | 3 +-- .../petstore_api/models/capitalization.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/cat.py | 3 +-- .../python-lazyImports/petstore_api/models/category.py | 3 +-- .../petstore_api/models/circular_all_of_ref.py | 3 +-- .../petstore_api/models/circular_reference_model.py | 3 +-- .../python-lazyImports/petstore_api/models/class_model.py | 3 +-- .../python-lazyImports/petstore_api/models/client.py | 3 +-- .../python-lazyImports/petstore_api/models/color.py | 6 ++---- .../python-lazyImports/petstore_api/models/creature.py | 3 +-- .../python-lazyImports/petstore_api/models/creature_info.py | 3 +-- .../python-lazyImports/petstore_api/models/danish_pig.py | 3 +-- .../petstore_api/models/data_output_format.py | 2 +- .../petstore_api/models/deprecated_object.py | 3 +-- .../petstore_api/models/discriminator_all_of_sub.py | 3 +-- .../petstore_api/models/discriminator_all_of_super.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/dog.py | 3 +-- .../python-lazyImports/petstore_api/models/dummy_model.py | 3 +-- .../python-lazyImports/petstore_api/models/enum_arrays.py | 3 +-- .../python-lazyImports/petstore_api/models/enum_class.py | 2 +- .../petstore_api/models/enum_number_vendor_ext.py | 2 +- .../petstore_api/models/enum_ref_with_default_value.py | 3 +-- .../python-lazyImports/petstore_api/models/enum_string1.py | 2 +- .../python-lazyImports/petstore_api/models/enum_string2.py | 2 +- .../petstore_api/models/enum_string_vendor_ext.py | 2 +- .../python-lazyImports/petstore_api/models/enum_test.py | 3 +-- .../python-lazyImports/petstore_api/models/feeding.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/file.py | 3 +-- .../petstore_api/models/file_schema_test_class.py | 3 +-- .../python-lazyImports/petstore_api/models/first_ref.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/foo.py | 3 +-- .../petstore_api/models/foo_get_default_response.py | 3 +-- .../python-lazyImports/petstore_api/models/format_test.py | 6 ++---- .../petstore_api/models/has_only_read_only.py | 3 +-- .../python-lazyImports/petstore_api/models/header_arg.py | 3 +-- .../petstore_api/models/health_check_result.py | 3 +-- .../python-lazyImports/petstore_api/models/hunting_dog.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/info.py | 3 +-- .../petstore_api/models/inner_dict_with_property.py | 3 +-- .../python-lazyImports/petstore_api/models/input_all_of.py | 3 +-- .../python-lazyImports/petstore_api/models/int_or_string.py | 6 ++---- .../python-lazyImports/petstore_api/models/known.py | 3 +-- .../python-lazyImports/petstore_api/models/list_class.py | 3 +-- .../petstore_api/models/map_of_array_of_model.py | 3 +-- .../python-lazyImports/petstore_api/models/map_test.py | 3 +-- .../mixed_properties_and_additional_properties_class.py | 3 +-- .../petstore_api/models/model200_response.py | 3 +-- .../petstore_api/models/model_api_response.py | 3 +-- .../python-lazyImports/petstore_api/models/model_field.py | 3 +-- .../python-lazyImports/petstore_api/models/model_return.py | 3 +-- .../python-lazyImports/petstore_api/models/multi_arrays.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/name.py | 3 +-- .../petstore_api/models/nullable_class.py | 3 +-- .../petstore_api/models/nullable_property.py | 6 ++---- .../python-lazyImports/petstore_api/models/number_only.py | 3 +-- .../models/object_to_test_additional_properties.py | 3 +-- .../petstore_api/models/object_with_deprecated_fields.py | 3 +-- .../petstore_api/models/one_of_enum_string.py | 3 +-- .../python-lazyImports/petstore_api/models/order.py | 3 +-- .../python-lazyImports/petstore_api/models/other.py | 3 +-- .../petstore_api/models/outer_composite.py | 3 +-- .../python-lazyImports/petstore_api/models/outer_enum.py | 2 +- .../petstore_api/models/outer_enum_default_value.py | 2 +- .../petstore_api/models/outer_enum_integer.py | 2 +- .../petstore_api/models/outer_enum_integer_default_value.py | 2 +- .../petstore_api/models/outer_object_with_enum_property.py | 3 +-- .../python-lazyImports/petstore_api/models/parent.py | 3 +-- .../petstore_api/models/parent_with_optional_dict.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/pet.py | 6 ++---- .../petstore/python-lazyImports/petstore_api/models/pig.py | 3 +-- .../python-lazyImports/petstore_api/models/pony_sizes.py | 3 +-- .../python-lazyImports/petstore_api/models/poop_cleaning.py | 3 +-- .../petstore_api/models/primitive_string.py | 3 +-- .../python-lazyImports/petstore_api/models/property_map.py | 3 +-- .../petstore_api/models/property_name_collision.py | 3 +-- .../petstore_api/models/read_only_first.py | 3 +-- .../petstore_api/models/second_circular_all_of_ref.py | 3 +-- .../python-lazyImports/petstore_api/models/second_ref.py | 3 +-- .../petstore_api/models/self_reference_model.py | 3 +-- .../petstore_api/models/single_ref_type.py | 2 +- .../petstore_api/models/special_character_enum.py | 2 +- .../petstore_api/models/special_model_name.py | 3 +-- .../python-lazyImports/petstore_api/models/special_name.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/tag.py | 3 +-- .../python-lazyImports/petstore_api/models/tagged_union.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/task.py | 3 +-- .../python-lazyImports/petstore_api/models/task_activity.py | 3 +-- .../python-lazyImports/petstore_api/models/test_enum.py | 2 +- .../petstore_api/models/test_enum_with_default.py | 2 +- .../models/test_error_responses_with_model400_response.py | 3 +-- .../models/test_error_responses_with_model404_response.py | 3 +-- .../test_inline_freeform_additional_properties_request.py | 3 +-- .../petstore_api/models/test_model_with_enum_default.py | 3 +-- .../test_object_for_multipart_requests_request_marker.py | 3 +-- .../python-lazyImports/petstore_api/models/tiger.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/type.py | 2 +- .../unnamed_dict_with_additional_model_list_properties.py | 3 +-- .../unnamed_dict_with_additional_string_list_properties.py | 3 +-- ...upload_file_with_additional_properties_request_object.py | 3 +-- .../petstore/python-lazyImports/petstore_api/models/user.py | 3 +-- .../petstore_api/models/uuid_with_pattern.py | 3 +-- .../petstore_api/models/with_nested_one_of.py | 3 +-- .../client/petstore/python-lazyImports/pyproject.toml | 1 - .../client/petstore/python-lazyImports/requirements.txt | 1 - .../openapi3/client/petstore/python-lazyImports/setup.py | 1 - .../petstore/python/petstore_api/api/another_fake_api.py | 5 ++--- .../client/petstore/python/petstore_api/api/default_api.py | 3 +-- .../client/petstore/python/petstore_api/api/fake_api.py | 6 ++---- .../python/petstore_api/api/fake_classname_tags123_api.py | 5 ++--- .../python/petstore_api/api/import_test_datetime_api.py | 3 +-- .../client/petstore/python/petstore_api/api/pet_api.py | 6 ++---- .../client/petstore/python/petstore_api/api/store_api.py | 6 ++---- .../client/petstore/python/petstore_api/api/user_api.py | 6 ++---- .../client/petstore/python/petstore_api/configuration.py | 3 +-- .../client/petstore/python/petstore_api/exceptions.py | 3 +-- .../petstore_api/models/additional_properties_any_type.py | 3 +-- .../petstore_api/models/additional_properties_class.py | 3 +-- .../petstore_api/models/additional_properties_object.py | 3 +-- .../models/additional_properties_with_description_only.py | 3 +-- .../python/petstore_api/models/all_of_super_model.py | 3 +-- .../python/petstore_api/models/all_of_with_single_ref.py | 3 +-- .../client/petstore/python/petstore_api/models/animal.py | 3 +-- .../petstore/python/petstore_api/models/any_of_color.py | 6 ++---- .../petstore/python/petstore_api/models/any_of_pig.py | 3 +-- .../python/petstore_api/models/array_of_array_of_model.py | 3 +-- .../petstore_api/models/array_of_array_of_number_only.py | 3 +-- .../python/petstore_api/models/array_of_map_model.py | 3 +-- .../python/petstore_api/models/array_of_number_only.py | 3 +-- .../petstore/python/petstore_api/models/array_test.py | 6 ++---- .../python/petstore_api/models/base_discriminator.py | 3 +-- .../petstore/python/petstore_api/models/basque_pig.py | 3 +-- .../client/petstore/python/petstore_api/models/bathing.py | 3 +-- .../petstore/python/petstore_api/models/capitalization.py | 3 +-- .../client/petstore/python/petstore_api/models/cat.py | 3 +-- .../client/petstore/python/petstore_api/models/category.py | 3 +-- .../python/petstore_api/models/circular_all_of_ref.py | 3 +-- .../python/petstore_api/models/circular_reference_model.py | 3 +-- .../petstore/python/petstore_api/models/class_model.py | 3 +-- .../client/petstore/python/petstore_api/models/client.py | 3 +-- .../client/petstore/python/petstore_api/models/color.py | 6 ++---- .../client/petstore/python/petstore_api/models/creature.py | 3 +-- .../petstore/python/petstore_api/models/creature_info.py | 3 +-- .../petstore/python/petstore_api/models/danish_pig.py | 3 +-- .../python/petstore_api/models/data_output_format.py | 2 +- .../python/petstore_api/models/deprecated_object.py | 3 +-- .../python/petstore_api/models/discriminator_all_of_sub.py | 3 +-- .../petstore_api/models/discriminator_all_of_super.py | 3 +-- .../client/petstore/python/petstore_api/models/dog.py | 3 +-- .../petstore/python/petstore_api/models/dummy_model.py | 3 +-- .../petstore/python/petstore_api/models/enum_arrays.py | 3 +-- .../petstore/python/petstore_api/models/enum_class.py | 2 +- .../python/petstore_api/models/enum_number_vendor_ext.py | 2 +- .../petstore_api/models/enum_ref_with_default_value.py | 3 +-- .../petstore/python/petstore_api/models/enum_string1.py | 2 +- .../petstore/python/petstore_api/models/enum_string2.py | 2 +- .../python/petstore_api/models/enum_string_vendor_ext.py | 2 +- .../client/petstore/python/petstore_api/models/enum_test.py | 3 +-- .../client/petstore/python/petstore_api/models/feeding.py | 3 +-- .../client/petstore/python/petstore_api/models/file.py | 3 +-- .../python/petstore_api/models/file_schema_test_class.py | 3 +-- .../client/petstore/python/petstore_api/models/first_ref.py | 3 +-- .../client/petstore/python/petstore_api/models/foo.py | 3 +-- .../python/petstore_api/models/foo_get_default_response.py | 3 +-- .../petstore/python/petstore_api/models/format_test.py | 6 ++---- .../python/petstore_api/models/has_only_read_only.py | 3 +-- .../petstore/python/petstore_api/models/header_arg.py | 3 +-- .../python/petstore_api/models/health_check_result.py | 3 +-- .../petstore/python/petstore_api/models/hunting_dog.py | 3 +-- .../client/petstore/python/petstore_api/models/info.py | 3 +-- .../python/petstore_api/models/inner_dict_with_property.py | 3 +-- .../petstore/python/petstore_api/models/input_all_of.py | 3 +-- .../petstore/python/petstore_api/models/int_or_string.py | 6 ++---- .../client/petstore/python/petstore_api/models/known.py | 3 +-- .../petstore/python/petstore_api/models/list_class.py | 3 +-- .../python/petstore_api/models/map_of_array_of_model.py | 3 +-- .../client/petstore/python/petstore_api/models/map_test.py | 3 +-- .../mixed_properties_and_additional_properties_class.py | 3 +-- .../python/petstore_api/models/model200_response.py | 3 +-- .../python/petstore_api/models/model_api_response.py | 3 +-- .../petstore/python/petstore_api/models/model_field.py | 3 +-- .../petstore/python/petstore_api/models/model_return.py | 3 +-- .../petstore/python/petstore_api/models/multi_arrays.py | 3 +-- .../client/petstore/python/petstore_api/models/name.py | 3 +-- .../petstore/python/petstore_api/models/nullable_class.py | 3 +-- .../python/petstore_api/models/nullable_property.py | 6 ++---- .../petstore/python/petstore_api/models/number_only.py | 3 +-- .../models/object_to_test_additional_properties.py | 3 +-- .../petstore_api/models/object_with_deprecated_fields.py | 3 +-- .../python/petstore_api/models/one_of_enum_string.py | 3 +-- .../client/petstore/python/petstore_api/models/order.py | 3 +-- .../client/petstore/python/petstore_api/models/other.py | 3 +-- .../petstore/python/petstore_api/models/outer_composite.py | 3 +-- .../petstore/python/petstore_api/models/outer_enum.py | 2 +- .../python/petstore_api/models/outer_enum_default_value.py | 2 +- .../python/petstore_api/models/outer_enum_integer.py | 2 +- .../petstore_api/models/outer_enum_integer_default_value.py | 2 +- .../petstore_api/models/outer_object_with_enum_property.py | 3 +-- .../client/petstore/python/petstore_api/models/parent.py | 3 +-- .../python/petstore_api/models/parent_with_optional_dict.py | 3 +-- .../client/petstore/python/petstore_api/models/pet.py | 6 ++---- .../client/petstore/python/petstore_api/models/pig.py | 3 +-- .../petstore/python/petstore_api/models/pony_sizes.py | 3 +-- .../petstore/python/petstore_api/models/poop_cleaning.py | 3 +-- .../petstore/python/petstore_api/models/primitive_string.py | 3 +-- .../petstore/python/petstore_api/models/property_map.py | 3 +-- .../python/petstore_api/models/property_name_collision.py | 3 +-- .../petstore/python/petstore_api/models/read_only_first.py | 3 +-- .../petstore_api/models/second_circular_all_of_ref.py | 3 +-- .../petstore/python/petstore_api/models/second_ref.py | 3 +-- .../python/petstore_api/models/self_reference_model.py | 3 +-- .../petstore/python/petstore_api/models/single_ref_type.py | 2 +- .../python/petstore_api/models/special_character_enum.py | 2 +- .../python/petstore_api/models/special_model_name.py | 3 +-- .../petstore/python/petstore_api/models/special_name.py | 3 +-- .../client/petstore/python/petstore_api/models/tag.py | 3 +-- .../petstore/python/petstore_api/models/tagged_union.py | 3 +-- .../client/petstore/python/petstore_api/models/task.py | 3 +-- .../petstore/python/petstore_api/models/task_activity.py | 3 +-- .../client/petstore/python/petstore_api/models/test_enum.py | 2 +- .../python/petstore_api/models/test_enum_with_default.py | 2 +- .../models/test_error_responses_with_model400_response.py | 3 +-- .../models/test_error_responses_with_model404_response.py | 3 +-- .../test_inline_freeform_additional_properties_request.py | 3 +-- .../petstore_api/models/test_model_with_enum_default.py | 3 +-- .../test_object_for_multipart_requests_request_marker.py | 3 +-- .../client/petstore/python/petstore_api/models/tiger.py | 3 +-- .../client/petstore/python/petstore_api/models/type.py | 2 +- .../unnamed_dict_with_additional_model_list_properties.py | 3 +-- .../unnamed_dict_with_additional_string_list_properties.py | 3 +-- ...upload_file_with_additional_properties_request_object.py | 3 +-- .../client/petstore/python/petstore_api/models/user.py | 3 +-- .../python/petstore_api/models/uuid_with_pattern.py | 3 +-- .../python/petstore_api/models/with_nested_one_of.py | 3 +-- samples/openapi3/client/petstore/python/pyproject.toml | 1 - samples/openapi3/client/petstore/python/requirements.txt | 1 - samples/openapi3/client/petstore/python/setup.py | 1 - samples/openapi3/client/petstore/python/tests/test_model.py | 2 +- .../python-fastapi/src/openapi_server/apis/fake_api.py | 3 +-- .../python-fastapi/src/openapi_server/apis/fake_api_base.py | 3 +-- .../python-fastapi/src/openapi_server/apis/pet_api.py | 3 +-- .../python-fastapi/src/openapi_server/apis/pet_api_base.py | 3 +-- .../python-fastapi/src/openapi_server/apis/store_api.py | 3 +-- .../src/openapi_server/apis/store_api_base.py | 3 +-- .../python-fastapi/src/openapi_server/apis/user_api.py | 3 +-- .../python-fastapi/src/openapi_server/apis/user_api_base.py | 3 +-- .../python-fastapi/src/openapi_server/models/category.py | 3 +-- 997 files changed, 1058 insertions(+), 2022 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java index e114405b7439..2577e70fcfe4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java @@ -1861,7 +1861,7 @@ private String asTypeConstraint(PythonImports imports, boolean withAnnotations) if (fieldParams.size() > 0) { imports.add(PYDANTIC, "Field"); - imports.add("typing_extensions", "Annotated"); + imports.add("typing", "Annotated"); currentType = "Annotated[" + currentType + ", Field(" + StringUtils.join(fieldParams, ", ") + ")]"; } diff --git a/modules/openapi-generator/src/main/resources/python/README_onlypackage.mustache b/modules/openapi-generator/src/main/resources/python/README_onlypackage.mustache index d205966d0bc5..8e90d9bb5884 100644 --- a/modules/openapi-generator/src/main/resources/python/README_onlypackage.mustache +++ b/modules/openapi-generator/src/main/resources/python/README_onlypackage.mustache @@ -37,7 +37,6 @@ To be able to use it, you will need these dependencies in your own package that * pycryptodome >= 3.9.0 {{/hasHttpSignatureMethods}} * pydantic >= 2.11 -* typing-extensions >= 4.7.1 ## Getting Started diff --git a/modules/openapi-generator/src/main/resources/python/api.mustache b/modules/openapi-generator/src/main/resources/python/api.mustache index c771516a8a49..a0736c0d0cf4 100644 --- a/modules/openapi-generator/src/main/resources/python/api.mustache +++ b/modules/openapi-generator/src/main/resources/python/api.mustache @@ -5,8 +5,7 @@ import json {{/x-python-has-json-header}} import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union {{#imports}} {{import}} diff --git a/modules/openapi-generator/src/main/resources/python/configuration.mustache b/modules/openapi-generator/src/main/resources/python/configuration.mustache index 920408100449..75827a771386 100644 --- a/modules/openapi-generator/src/main/resources/python/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/python/configuration.mustache @@ -18,12 +18,11 @@ import multiprocessing import ssl {{/async}} import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union {{^async}} from urllib.parse import urlparse from urllib.request import getproxies {{/async}} -from typing_extensions import NotRequired, Self {{^async}} import urllib3 diff --git a/modules/openapi-generator/src/main/resources/python/exceptions.mustache b/modules/openapi-generator/src/main/resources/python/exceptions.mustache index cf72bbfa80b9..f6792b792d9d 100644 --- a/modules/openapi-generator/src/main/resources/python/exceptions.mustache +++ b/modules/openapi-generator/src/main/resources/python/exceptions.mustache @@ -1,7 +1,6 @@ {{>partial_header}} -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/modules/openapi-generator/src/main/resources/python/model_anyof.mustache b/modules/openapi-generator/src/main/resources/python/model_anyof.mustache index ff77f479f37a..7b68d2802f99 100644 --- a/modules/openapi-generator/src/main/resources/python/model_anyof.mustache +++ b/modules/openapi-generator/src/main/resources/python/model_anyof.mustache @@ -9,8 +9,7 @@ import re # noqa: F401 {{#vendorExtensions.x-py-model-imports}} {{{.}}} {{/vendorExtensions.x-py-model-imports}} -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field {{#compatibleWithPythonLegacy}} from pydantic_core import to_jsonable_python diff --git a/modules/openapi-generator/src/main/resources/python/model_enum.mustache b/modules/openapi-generator/src/main/resources/python/model_enum.mustache index 3f449b121a33..0ae1f0d4632b 100644 --- a/modules/openapi-generator/src/main/resources/python/model_enum.mustache +++ b/modules/openapi-generator/src/main/resources/python/model_enum.mustache @@ -4,7 +4,7 @@ from enum import Enum {{#vendorExtensions.x-py-other-imports}} {{{.}}} {{/vendorExtensions.x-py-other-imports}} -from typing_extensions import Self +from typing import Self class {{classname}}({{vendorExtensions.x-py-enum-type}}, Enum): diff --git a/modules/openapi-generator/src/main/resources/python/model_generic.mustache b/modules/openapi-generator/src/main/resources/python/model_generic.mustache index 6f3b20789979..07f7f6664db5 100644 --- a/modules/openapi-generator/src/main/resources/python/model_generic.mustache +++ b/modules/openapi-generator/src/main/resources/python/model_generic.mustache @@ -9,8 +9,7 @@ import json {{#vendorExtensions.x-py-model-imports}} {{{.}}} {{/vendorExtensions.x-py-model-imports}} -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python {{#vendorExtensions.x-py-has-public-name-properties}} from typing import TYPE_CHECKING diff --git a/modules/openapi-generator/src/main/resources/python/model_oneof.mustache b/modules/openapi-generator/src/main/resources/python/model_oneof.mustache index 696d3ff4be6f..7484005df54e 100644 --- a/modules/openapi-generator/src/main/resources/python/model_oneof.mustache +++ b/modules/openapi-generator/src/main/resources/python/model_oneof.mustache @@ -8,8 +8,7 @@ import pprint {{{.}}} {{/vendorExtensions.x-py-model-imports}} from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self {{#compatibleWithPythonLegacy}} from pydantic_core import to_jsonable_python diff --git a/modules/openapi-generator/src/main/resources/python/pyproject.mustache b/modules/openapi-generator/src/main/resources/python/pyproject.mustache index 109cff467caa..8e62881720f8 100644 --- a/modules/openapi-generator/src/main/resources/python/pyproject.mustache +++ b/modules/openapi-generator/src/main/resources/python/pyproject.mustache @@ -57,7 +57,6 @@ pem = ">= 19.3.0" pycryptodome = ">= 3.9.0" {{/hasHttpSignatureMethods}} pydantic = ">= 2.11" -typing-extensions = ">= 4.7.1" {{/poetry1}} {{^poetry1}} requires-python = ">=3.11" @@ -82,7 +81,6 @@ dependencies = [ "pycryptodome (>=3.9.0)", {{/hasHttpSignatureMethods}} "pydantic (>=2.11)", - "typing-extensions (>=4.7.1)", ] [project.urls] diff --git a/modules/openapi-generator/src/main/resources/python/requirements.mustache b/modules/openapi-generator/src/main/resources/python/requirements.mustache index 36f07decbdbf..dd1b3bea5fc8 100644 --- a/modules/openapi-generator/src/main/resources/python/requirements.mustache +++ b/modules/openapi-generator/src/main/resources/python/requirements.mustache @@ -17,4 +17,3 @@ pem >= 19.3.0 pycryptodome >= 3.9.0 {{/hasHttpSignatureMethods}} pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/modules/openapi-generator/src/main/resources/python/setup.mustache b/modules/openapi-generator/src/main/resources/python/setup.mustache index 8f0da3eee18d..77b9e6c2f47f 100644 --- a/modules/openapi-generator/src/main/resources/python/setup.mustache +++ b/modules/openapi-generator/src/main/resources/python/setup.mustache @@ -31,7 +31,6 @@ REQUIRES = [ "pycryptodome >= 3.9.0", {{/hasHttpSignatureMethods}} "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/auth_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/auth_api.py index 551e07af01bd..3c6a5475d8b6 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/auth_api.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/auth_api.py @@ -13,8 +13,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import StrictStr diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/body_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/body_api.py index 69360616c450..a89a48ddd820 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/body_api.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/body_api.py @@ -13,12 +13,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBytes, StrictStr -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from openapi_client.models.pet import Pet from openapi_client.models.string_enum_ref import StringEnumRef from openapi_client.models.tag import Tag diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/form_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/form_api.py index e9b0038cda16..660599cbbafe 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/form_api.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/form_api.py @@ -13,8 +13,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import StrictBool, StrictInt, StrictStr from typing import Optional diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/header_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/header_api.py index b7572b76afec..66e9ad1a2fbb 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/header_api.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/header_api.py @@ -13,8 +13,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import StrictBool, StrictInt, StrictStr, field_validator from typing import Optional diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/path_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/path_api.py index d3e2de0529f9..a65d56c9c43c 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/path_api.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/path_api.py @@ -13,8 +13,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import StrictInt, StrictStr, field_validator from openapi_client.models.string_enum_ref import StringEnumRef diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/query_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/query_api.py index d8271833134e..4aa5bf747838 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/query_api.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/query_api.py @@ -13,8 +13,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import date, datetime from pydantic import StrictBool, StrictInt, StrictStr, field_validator diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/configuration.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/configuration.py index f2411fe6bd9d..8b2f346f9e70 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/configuration.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/configuration.py @@ -18,10 +18,9 @@ import multiprocessing import ssl import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union from urllib.parse import urlparse from urllib.request import getproxies -from typing_extensions import NotRequired, Self import urllib3 diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/exceptions.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/exceptions.py index b55bc7fd4d80..f1945ffef975 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/exceptions.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/exceptions.py @@ -11,8 +11,7 @@ """ # noqa: E501 -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/bird.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/bird.py index dc57e5aefb4a..e7ae77c8c19f 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/bird.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/bird.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Bird(BaseModel): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/category.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/category.py index 6736684be811..5ebfcb76199d 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/category.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/category.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Category(BaseModel): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/data_query.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/data_query.py index e9e6456d4022..d19e46cda032 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/data_query.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/data_query.py @@ -22,8 +22,7 @@ from pydantic import ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from openapi_client.models.query import Query -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DataQuery(Query): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/default_value.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/default_value.py index a6139f9d813f..084ec3cf7c57 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/default_value.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/default_value.py @@ -21,8 +21,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from openapi_client.models.string_enum_ref import StringEnumRef -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DefaultValue(BaseModel): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/number_properties_only.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/number_properties_only.py index 7798675f9ad7..bd943e8ffa00 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/number_properties_only.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/number_properties_only.py @@ -19,10 +19,8 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt -from typing import Any, ClassVar, Dict, List, Optional, Union -from typing_extensions import Annotated -from typing import Optional, Set -from typing_extensions import Self +from typing import Annotated, Any, ClassVar, Dict, List, Optional, Union +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NumberPropertiesOnly(BaseModel): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/pet.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/pet.py index 123de7d19268..5be4e4bb7518 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/pet.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/pet.py @@ -22,8 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional from openapi_client.models.category import Category from openapi_client.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Pet(BaseModel): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/query.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/query.py index 2114ca55db44..6e6ea821af37 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/query.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/query.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Query(BaseModel): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/string_enum_ref.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/string_enum_ref.py index 90328aea76dd..1ee2840f0d13 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/string_enum_ref.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/string_enum_ref.py @@ -16,7 +16,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class StringEnumRef(str, Enum): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/tag.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/tag.py index 23a5e7148c50..dddf468f1bb2 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/tag.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/tag.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tag(BaseModel): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_form_object_multipart_request_marker.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_form_object_multipart_request_marker.py index 86365217f05b..9f6ba5b5c629 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_form_object_multipart_request_marker.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_form_object_multipart_request_marker.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestFormObjectMultipartRequestMarker(BaseModel): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py index c31ebefee74d..654e62c8e2be 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter(BaseModel): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py index c8a9f0b889e0..4053fe1b053a 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter(BaseModel): diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/pyproject.toml b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/pyproject.toml index c8ba8d656bd2..658a124e6cc2 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/pyproject.toml +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/pyproject.toml @@ -14,7 +14,6 @@ dependencies = [ "urllib3 (>=2.7.0,<3.0.0)", "python-dateutil (>=2.8.2)", "pydantic (>=2.11)", - "typing-extensions (>=4.7.1)", ] [project.urls] diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/requirements.txt b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/requirements.txt index 1d751a9a2254..8445d540dbc7 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/requirements.txt +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/requirements.txt @@ -1,4 +1,3 @@ urllib3 >= 2.7.0, < 3.0.0 python_dateutil >= 2.8.2 pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/setup.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/setup.py index 20494a74d591..72ae770296d9 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/setup.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/setup.py @@ -26,7 +26,6 @@ "urllib3 >= 2.7.0, < 3.0.0", "python-dateutil >= 2.8.2", "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/client/echo_api/python/openapi_client/api/auth_api.py b/samples/client/echo_api/python/openapi_client/api/auth_api.py index 551e07af01bd..3c6a5475d8b6 100644 --- a/samples/client/echo_api/python/openapi_client/api/auth_api.py +++ b/samples/client/echo_api/python/openapi_client/api/auth_api.py @@ -13,8 +13,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import StrictStr diff --git a/samples/client/echo_api/python/openapi_client/api/body_api.py b/samples/client/echo_api/python/openapi_client/api/body_api.py index 69360616c450..a89a48ddd820 100644 --- a/samples/client/echo_api/python/openapi_client/api/body_api.py +++ b/samples/client/echo_api/python/openapi_client/api/body_api.py @@ -13,12 +13,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBytes, StrictStr -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from openapi_client.models.pet import Pet from openapi_client.models.string_enum_ref import StringEnumRef from openapi_client.models.tag import Tag diff --git a/samples/client/echo_api/python/openapi_client/api/form_api.py b/samples/client/echo_api/python/openapi_client/api/form_api.py index e9b0038cda16..660599cbbafe 100644 --- a/samples/client/echo_api/python/openapi_client/api/form_api.py +++ b/samples/client/echo_api/python/openapi_client/api/form_api.py @@ -13,8 +13,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import StrictBool, StrictInt, StrictStr from typing import Optional diff --git a/samples/client/echo_api/python/openapi_client/api/header_api.py b/samples/client/echo_api/python/openapi_client/api/header_api.py index b7572b76afec..66e9ad1a2fbb 100644 --- a/samples/client/echo_api/python/openapi_client/api/header_api.py +++ b/samples/client/echo_api/python/openapi_client/api/header_api.py @@ -13,8 +13,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import StrictBool, StrictInt, StrictStr, field_validator from typing import Optional diff --git a/samples/client/echo_api/python/openapi_client/api/path_api.py b/samples/client/echo_api/python/openapi_client/api/path_api.py index d3e2de0529f9..a65d56c9c43c 100644 --- a/samples/client/echo_api/python/openapi_client/api/path_api.py +++ b/samples/client/echo_api/python/openapi_client/api/path_api.py @@ -13,8 +13,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import StrictInt, StrictStr, field_validator from openapi_client.models.string_enum_ref import StringEnumRef diff --git a/samples/client/echo_api/python/openapi_client/api/query_api.py b/samples/client/echo_api/python/openapi_client/api/query_api.py index d8271833134e..4aa5bf747838 100644 --- a/samples/client/echo_api/python/openapi_client/api/query_api.py +++ b/samples/client/echo_api/python/openapi_client/api/query_api.py @@ -13,8 +13,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import date, datetime from pydantic import StrictBool, StrictInt, StrictStr, field_validator diff --git a/samples/client/echo_api/python/openapi_client/configuration.py b/samples/client/echo_api/python/openapi_client/configuration.py index f2411fe6bd9d..8b2f346f9e70 100644 --- a/samples/client/echo_api/python/openapi_client/configuration.py +++ b/samples/client/echo_api/python/openapi_client/configuration.py @@ -18,10 +18,9 @@ import multiprocessing import ssl import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union from urllib.parse import urlparse from urllib.request import getproxies -from typing_extensions import NotRequired, Self import urllib3 diff --git a/samples/client/echo_api/python/openapi_client/exceptions.py b/samples/client/echo_api/python/openapi_client/exceptions.py index b55bc7fd4d80..f1945ffef975 100644 --- a/samples/client/echo_api/python/openapi_client/exceptions.py +++ b/samples/client/echo_api/python/openapi_client/exceptions.py @@ -11,8 +11,7 @@ """ # noqa: E501 -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/samples/client/echo_api/python/openapi_client/models/bird.py b/samples/client/echo_api/python/openapi_client/models/bird.py index 97c0cf36eb54..0f21b4eff001 100644 --- a/samples/client/echo_api/python/openapi_client/models/bird.py +++ b/samples/client/echo_api/python/openapi_client/models/bird.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Bird(BaseModel): diff --git a/samples/client/echo_api/python/openapi_client/models/category.py b/samples/client/echo_api/python/openapi_client/models/category.py index 75ed69c43a00..440694c2aeb1 100644 --- a/samples/client/echo_api/python/openapi_client/models/category.py +++ b/samples/client/echo_api/python/openapi_client/models/category.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Category(BaseModel): diff --git a/samples/client/echo_api/python/openapi_client/models/data_query.py b/samples/client/echo_api/python/openapi_client/models/data_query.py index 4a8198831591..a61e4e80c585 100644 --- a/samples/client/echo_api/python/openapi_client/models/data_query.py +++ b/samples/client/echo_api/python/openapi_client/models/data_query.py @@ -22,8 +22,7 @@ from pydantic import ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from openapi_client.models.query import Query -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DataQuery(Query): diff --git a/samples/client/echo_api/python/openapi_client/models/default_value.py b/samples/client/echo_api/python/openapi_client/models/default_value.py index 70883914b34f..a260708bfcae 100644 --- a/samples/client/echo_api/python/openapi_client/models/default_value.py +++ b/samples/client/echo_api/python/openapi_client/models/default_value.py @@ -21,8 +21,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from openapi_client.models.string_enum_ref import StringEnumRef -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DefaultValue(BaseModel): diff --git a/samples/client/echo_api/python/openapi_client/models/number_properties_only.py b/samples/client/echo_api/python/openapi_client/models/number_properties_only.py index 5f5cd1367f07..d4c84a5b73e6 100644 --- a/samples/client/echo_api/python/openapi_client/models/number_properties_only.py +++ b/samples/client/echo_api/python/openapi_client/models/number_properties_only.py @@ -19,10 +19,8 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt -from typing import Any, ClassVar, Dict, List, Optional, Union -from typing_extensions import Annotated -from typing import Optional, Set -from typing_extensions import Self +from typing import Annotated, Any, ClassVar, Dict, List, Optional, Union +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NumberPropertiesOnly(BaseModel): diff --git a/samples/client/echo_api/python/openapi_client/models/pet.py b/samples/client/echo_api/python/openapi_client/models/pet.py index a9df04fb4fc2..f1a77f8a7d80 100644 --- a/samples/client/echo_api/python/openapi_client/models/pet.py +++ b/samples/client/echo_api/python/openapi_client/models/pet.py @@ -22,8 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional from openapi_client.models.category import Category from openapi_client.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Pet(BaseModel): diff --git a/samples/client/echo_api/python/openapi_client/models/query.py b/samples/client/echo_api/python/openapi_client/models/query.py index 2114ca55db44..6e6ea821af37 100644 --- a/samples/client/echo_api/python/openapi_client/models/query.py +++ b/samples/client/echo_api/python/openapi_client/models/query.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Query(BaseModel): diff --git a/samples/client/echo_api/python/openapi_client/models/string_enum_ref.py b/samples/client/echo_api/python/openapi_client/models/string_enum_ref.py index 90328aea76dd..1ee2840f0d13 100644 --- a/samples/client/echo_api/python/openapi_client/models/string_enum_ref.py +++ b/samples/client/echo_api/python/openapi_client/models/string_enum_ref.py @@ -16,7 +16,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class StringEnumRef(str, Enum): diff --git a/samples/client/echo_api/python/openapi_client/models/tag.py b/samples/client/echo_api/python/openapi_client/models/tag.py index 36b0196d0db8..38607d9385de 100644 --- a/samples/client/echo_api/python/openapi_client/models/tag.py +++ b/samples/client/echo_api/python/openapi_client/models/tag.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tag(BaseModel): diff --git a/samples/client/echo_api/python/openapi_client/models/test_form_object_multipart_request_marker.py b/samples/client/echo_api/python/openapi_client/models/test_form_object_multipart_request_marker.py index 713fc0196d58..41ca4b477a6e 100644 --- a/samples/client/echo_api/python/openapi_client/models/test_form_object_multipart_request_marker.py +++ b/samples/client/echo_api/python/openapi_client/models/test_form_object_multipart_request_marker.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestFormObjectMultipartRequestMarker(BaseModel): diff --git a/samples/client/echo_api/python/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py b/samples/client/echo_api/python/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py index 699bbaf231b3..b1fb6ee4c0c7 100644 --- a/samples/client/echo_api/python/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py +++ b/samples/client/echo_api/python/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter(BaseModel): diff --git a/samples/client/echo_api/python/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py b/samples/client/echo_api/python/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py index 5f8b9b5af3e1..d5dde919749d 100644 --- a/samples/client/echo_api/python/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py +++ b/samples/client/echo_api/python/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter(BaseModel): diff --git a/samples/client/echo_api/python/pyproject.toml b/samples/client/echo_api/python/pyproject.toml index c8ba8d656bd2..658a124e6cc2 100644 --- a/samples/client/echo_api/python/pyproject.toml +++ b/samples/client/echo_api/python/pyproject.toml @@ -14,7 +14,6 @@ dependencies = [ "urllib3 (>=2.7.0,<3.0.0)", "python-dateutil (>=2.8.2)", "pydantic (>=2.11)", - "typing-extensions (>=4.7.1)", ] [project.urls] diff --git a/samples/client/echo_api/python/requirements.txt b/samples/client/echo_api/python/requirements.txt index 1d751a9a2254..8445d540dbc7 100644 --- a/samples/client/echo_api/python/requirements.txt +++ b/samples/client/echo_api/python/requirements.txt @@ -1,4 +1,3 @@ urllib3 >= 2.7.0, < 3.0.0 python_dateutil >= 2.8.2 pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/samples/client/echo_api/python/setup.py b/samples/client/echo_api/python/setup.py index 20494a74d591..72ae770296d9 100644 --- a/samples/client/echo_api/python/setup.py +++ b/samples/client/echo_api/python/setup.py @@ -26,7 +26,6 @@ "urllib3 >= 2.7.0, < 3.0.0", "python-dateutil >= 2.8.2", "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/api/default_api.py b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/api/default_api.py index 2dff3238e7c7..830e0c1c5070 100644 --- a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/api/default_api.py +++ b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/api/default_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from typing import List from legacy_model_dict_client.models.legacy_model import LegacyModel diff --git a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/configuration.py b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/configuration.py index b99862654f04..7afa3fd6cc4d 100644 --- a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/configuration.py +++ b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/configuration.py @@ -17,10 +17,9 @@ import multiprocessing import ssl import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union from urllib.parse import urlparse from urllib.request import getproxies -from typing_extensions import NotRequired, Self import urllib3 diff --git a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/exceptions.py b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/exceptions.py index 47c0c5463615..98fd1da4d1d1 100644 --- a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/exceptions.py +++ b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/exceptions.py @@ -10,8 +10,7 @@ """ # noqa: E501 -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/additional_properties_model.py b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/additional_properties_model.py index 402c23f390fe..6e4ce9f7d91d 100644 --- a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/additional_properties_model.py +++ b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/additional_properties_model.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python diff --git a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/any_of_model.py b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/any_of_model.py index 52c806603cb7..d96c949396f1 100644 --- a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/any_of_model.py +++ b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/any_of_model.py @@ -21,8 +21,7 @@ from typing import Dict, List, Optional from legacy_model_dict_client.models.legacy_model import LegacyModel from legacy_model_dict_client.models.nested_model import NestedModel -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field from pydantic_core import to_jsonable_python diff --git a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/legacy_base.py b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/legacy_base.py index 5d0b9713ad9f..fa89035569f6 100644 --- a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/legacy_base.py +++ b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/legacy_base.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python diff --git a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/legacy_model.py b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/legacy_model.py index 0378f5dc487f..25b57fb3d92a 100644 --- a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/legacy_model.py +++ b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/legacy_model.py @@ -21,8 +21,7 @@ from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast from legacy_model_dict_client.models.nested_model import NestedModel -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/nested_model.py b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/nested_model.py index 25a8613393b9..1aff59d7f682 100644 --- a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/nested_model.py +++ b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/nested_model.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python diff --git a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/one_of_model.py b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/one_of_model.py index b76545cb241a..b8377134c416 100644 --- a/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/one_of_model.py +++ b/samples/client/others/python-legacy-model-dictionaries/legacy_model_dict_client/models/one_of_model.py @@ -20,8 +20,7 @@ from legacy_model_dict_client.models.legacy_model import LegacyModel from legacy_model_dict_client.models.nested_model import NestedModel from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self from pydantic_core import to_jsonable_python diff --git a/samples/client/others/python-legacy-model-dictionaries/pyproject.toml b/samples/client/others/python-legacy-model-dictionaries/pyproject.toml index 5f5e6b8ae3d5..ecfd0f81be63 100644 --- a/samples/client/others/python-legacy-model-dictionaries/pyproject.toml +++ b/samples/client/others/python-legacy-model-dictionaries/pyproject.toml @@ -13,7 +13,6 @@ dependencies = [ "urllib3 (>=2.7.0,<3.0.0)", "python-dateutil (>=2.8.2)", "pydantic (>=2.11)", - "typing-extensions (>=4.7.1)", ] [project.urls] diff --git a/samples/client/others/python-legacy-model-dictionaries/requirements.txt b/samples/client/others/python-legacy-model-dictionaries/requirements.txt index 1d751a9a2254..8445d540dbc7 100644 --- a/samples/client/others/python-legacy-model-dictionaries/requirements.txt +++ b/samples/client/others/python-legacy-model-dictionaries/requirements.txt @@ -1,4 +1,3 @@ urllib3 >= 2.7.0, < 3.0.0 python_dateutil >= 2.8.2 pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/samples/client/others/python-legacy-model-dictionaries/setup.py b/samples/client/others/python-legacy-model-dictionaries/setup.py index d18c5efcc6cf..bd7d71ba23ff 100644 --- a/samples/client/others/python-legacy-model-dictionaries/setup.py +++ b/samples/client/others/python-legacy-model-dictionaries/setup.py @@ -25,7 +25,6 @@ "urllib3 >= 2.7.0, < 3.0.0", "python-dateutil >= 2.8.2", "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/another_fake_api.py index efe518659150..bf1e70aefec8 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/another_fake_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/default_api.py index 9370d404e284..f49bfa3dc18b 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/default_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from petstore_api.models.foo_get_default_response import FooGetDefaultResponse diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py index 99e4031552c1..e2b3788af0d9 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py @@ -13,13 +13,11 @@ import json import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import date, datetime from pydantic import Field, StrictBool, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from uuid import UUID from petstore_api.models.client import Client from petstore_api.models.enum_class import EnumClass diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_classname_tags123_api.py index 61dbccb2cc61..f3933e413f73 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_classname_tags123_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/import_test_datetime_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/import_test_datetime_api.py index 3556c26f0a22..f73dbb6285fc 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/import_test_datetime_api.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/import_test_datetime_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import datetime diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/pet_api.py index 6aec11242f59..d4ef71f34634 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/pet_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, List, Optional, Tuple, Union from petstore_api.models.model_api_response import ModelApiResponse from petstore_api.models.pet import Pet diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/store_api.py index 85a52d796667..11ca29923049 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/store_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictInt, StrictStr -from typing import Dict -from typing_extensions import Annotated +from typing import Annotated, Dict from petstore_api.models.order import Order from petstore_api.api_client import ApiClient, RequestSerialized 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 a6ed97e521c4..6882ade16caa 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 @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictStr -from typing import List -from typing_extensions import Annotated +from typing import Annotated, List from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py index 38f5a69aeef3..3cc9440e9843 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py @@ -18,8 +18,7 @@ import logging from logging import FileHandler import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union -from typing_extensions import NotRequired, Self +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union from petstore_api.signing import HttpSigningConfiguration diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/exceptions.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/exceptions.py index 8e7fcf82d538..d978c12f2b67 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/exceptions.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/exceptions.py @@ -10,8 +10,7 @@ """ # noqa: E501 -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_any_type.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_any_type.py index 19db20137bc4..195345309ff3 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_any_type.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_any_type.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesAnyType(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_class.py index c305a68c725f..5f9d21f2697d 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.pet import Pet -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_object.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_object.py index d23fd87e51f3..41c2b4aea078 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_object.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_with_description_only.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_with_description_only.py index b1f42400b676..197648ee0a36 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_with_description_only.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_with_description_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesWithDescriptionOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/all_of_super_model.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/all_of_super_model.py index 4793b8e4b3cd..b8dcac0f1e64 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/all_of_super_model.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/all_of_super_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfSuperModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/all_of_with_single_ref.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/all_of_with_single_ref.py index 34e4c3dca7ea..07f66ebe8325 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/all_of_with_single_ref.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/all_of_with_single_ref.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.single_ref_type import SingleRefType -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfWithSingleRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/animal.py index 7337a96aa42c..7e54b4d6fd45 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/animal.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/animal.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/any_of_color.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/any_of_color.py index f6d277e79498..4bcb6a751c30 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/any_of_color.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/any_of_color.py @@ -18,10 +18,8 @@ import pprint import re # noqa: F401 from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import List, Optional -from typing_extensions import Annotated -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Annotated, List, Optional +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/any_of_pig.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/any_of_pig.py index c949e136f415..ba66686bc9c8 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/any_of_pig.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/any_of_pig.py @@ -21,8 +21,7 @@ from typing import Optional from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_array_of_model.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_array_of_model.py index 896229b2570a..213bc1d38660 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_array_of_number_only.py index 3fb0fb5056f6..d39c0be8858d 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_map_model.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_map_model.py index 8e03d5766e33..568f99edfcba 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_map_model.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_map_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfMapModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_number_only.py index 12b045326e11..f1803a5f12b4 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_test.py index bb80aa6ab77d..f28889ed5fcf 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_test.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_test.py @@ -18,11 +18,9 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.read_only_first import ReadOnlyFirst -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/base_discriminator.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/base_discriminator.py index 955dd21246d4..f313f3477ce6 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/base_discriminator.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/base_discriminator.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/basque_pig.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/basque_pig.py index b279e5a53e14..58f4a8eeac7e 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/basque_pig.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/basque_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class BasquePig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/bathing.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/bathing.py index 46b35c700e2b..a1d5a741d26b 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/bathing.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/bathing.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Bathing(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/capitalization.py index f4af4f06f207..6996d6a337e7 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/capitalization.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/capitalization.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Capitalization(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/cat.py index 8692ceebb9a6..23269ba1d6c4 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/cat.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/cat.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictBool from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Cat(Animal): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/category.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/category.py index f7d60fe80c03..67f22394fda5 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/category.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/category.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Category(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/circular_all_of_ref.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/circular_all_of_ref.py index 69d6cfd2bdf4..749f48312086 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/circular_reference_model.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/circular_reference_model.py index f43b0863da44..61efdad97c65 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/circular_reference_model.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/circular_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/class_model.py index 331958d9b209..6903989abf92 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/class_model.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/class_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ClassModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/client.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/client.py index cdbddee56d31..148f480265fe 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/client.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/client.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Client(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/color.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/color.py index bb740fb597d4..6d69a03f9b2e 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/color.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/color.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature.py index 29cfc5e5f56c..776dfb8d7d8b 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature.py @@ -21,8 +21,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Union from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature_info.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature_info.py index 2488eca5d562..ba753358b553 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature_info.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature_info.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CreatureInfo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/danish_pig.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/danish_pig.py index ad3e5496cbd1..26200765c775 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/danish_pig.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/danish_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DanishPig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/data_output_format.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/data_output_format.py index ee3df76c5169..af7b5d212fc2 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/data_output_format.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/data_output_format.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class DataOutputFormat(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/deprecated_object.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/deprecated_object.py index 0c09f54f0e91..1c1190b7d9f1 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/deprecated_object.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/deprecated_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DeprecatedObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/discriminator_all_of_sub.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/discriminator_all_of_sub.py index f5a0aa665e7f..ab29addbb172 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/discriminator_all_of_sub.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/discriminator_all_of_sub.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DiscriminatorAllOfSub(DiscriminatorAllOfSuper): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/discriminator_all_of_super.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/discriminator_all_of_super.py index 275312d713ad..74faf8314dba 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/discriminator_all_of_super.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/discriminator_all_of_super.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/dog.py index b8752a1f948f..4fe37d2b44c1 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/dog.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/dog.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Dog(Animal): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/dummy_model.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/dummy_model.py index 19a8109a056d..8ccb3d483c0d 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/dummy_model.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/dummy_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DummyModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_arrays.py index d841ea10e5b8..c56e880111b0 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_arrays.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_class.py index 1ba5af8036df..8d4effa9573a 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_class.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_class.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumClass(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_number_vendor_ext.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_number_vendor_ext.py index 5588de5c7043..a7e98fb3b521 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_number_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_number_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumNumberVendorExt(int, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_ref_with_default_value.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_ref_with_default_value.py index 5c29c04aa7f2..e4a77e52206d 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_ref_with_default_value.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_ref_with_default_value.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.data_output_format import DataOutputFormat -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumRefWithDefaultValue(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string1.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string1.py index 678b4e12661f..e14b8e930b6a 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string1.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string1.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString1(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string2.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string2.py index a959f554e0af..9f8f6c0fc0eb 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string2.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string2.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString2(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string_vendor_ext.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string_vendor_ext.py index 821812e9b088..a94b2a9afa35 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_string_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumStringVendorExt(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_test.py index 604194529754..c5674e26b58b 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_test.py @@ -25,8 +25,7 @@ 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 typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/feeding.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/feeding.py index ce5a36f49afb..d1ca63749b8a 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/feeding.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/feeding.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Feeding(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/file.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/file.py index 7d8d010f8c82..7ed84d23410b 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/file.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/file.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class File(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/file_schema_test_class.py index 5e8ca6861d83..5c9924850f5c 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/file_schema_test_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FileSchemaTestClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/first_ref.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/first_ref.py index 5c03477f15f0..8dd448e7c018 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/first_ref.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/first_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FirstRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/foo.py index 65a289e187de..108169a3f140 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/foo.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/foo.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Foo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/foo_get_default_response.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/foo_get_default_response.py index e3a3f7a66aed..b0d11fa1976a 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/foo_get_default_response.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/foo_get_default_response.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.foo import Foo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FooGetDefaultResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/format_test.py index 92f3cacf7f91..2bc43ade9948 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/format_test.py @@ -20,11 +20,9 @@ from datetime import date, datetime from decimal import Decimal from pydantic import BaseModel, ConfigDict, Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional, Tuple, Union from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FormatTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/has_only_read_only.py index c7a1c9f0913e..ec8ece81be5e 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/has_only_read_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HasOnlyReadOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/header_arg.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/header_arg.py index bd8d1b0090ed..553fe8105251 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/header_arg.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/header_arg.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HeaderArg(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/health_check_result.py index 270725757bad..df0360f75353 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/health_check_result.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HealthCheckResult(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/hunting_dog.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/hunting_dog.py index 4064ce67183c..43a54e233de3 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/hunting_dog.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/hunting_dog.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature import Creature from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HuntingDog(Creature): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/info.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/info.py index 0f57b71af2aa..040b9ea8c185 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/info.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/info.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Info(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/inner_dict_with_property.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/inner_dict_with_property.py index 9b709fb15e43..67abdb430ff1 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/inner_dict_with_property.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/inner_dict_with_property.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InnerDictWithProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/input_all_of.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/input_all_of.py index e03dd4fc3839..61bc42bb9ae2 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/input_all_of.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/input_all_of.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InputAllOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/int_or_string.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/int_or_string.py index f2a5a0a2d4a3..4343951a010d 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/int_or_string.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/int_or_string.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"] diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/known.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/known.py index daf64e57b96d..6508435d7c0d 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/known.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/known.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Known(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/list_class.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/list_class.py index 634b8d012d29..f4217e29aa95 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/list_class.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/list_class.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ListClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_of_array_of_model.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_of_array_of_model.py index e22e38fe0b59..e57d8166ea4e 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_test.py index ac4080efbc88..c54debde848c 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_test.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py index 20091d09ce86..51081afdaad5 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -22,8 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model200_response.py index 63c9faad21f5..eaeccd5fc6d7 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model200_response.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model200_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Model200Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_api_response.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_api_response.py index 517441e5d545..e81f467aeb7a 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_api_response.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_api_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelApiResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_field.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_field.py index 80951622bed4..648b750801e5 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_field.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_field.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelField(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_return.py index 374b0b454781..6637cfd373cd 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_return.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_return.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelReturn(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/multi_arrays.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/multi_arrays.py index 00d62ef2df3e..2aa3a0d03398 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/multi_arrays.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/multi_arrays.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MultiArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/name.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/name.py index 9b4f7a436ed6..53ec70e661b6 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/name.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Name(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/nullable_class.py index 25c6ba3d4d39..ff2f4c651c33 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/nullable_class.py @@ -20,8 +20,7 @@ from datetime import date, datetime from pydantic import BaseModel, ConfigDict, StrictBool, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/nullable_property.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/nullable_property.py index 819cc52809b9..95373a2be755 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/nullable_property.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/nullable_property.py @@ -18,10 +18,8 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated -from typing import Optional, Set -from typing_extensions import Self +from typing import Annotated, Any, ClassVar, Dict, List, Optional +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/number_only.py index b91b8d045003..41accc1a9d40 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/number_only.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/object_to_test_additional_properties.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/object_to_test_additional_properties.py index 2ac8a9d37a2c..1e2ea9923997 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/object_to_test_additional_properties.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/object_to_test_additional_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectToTestAdditionalProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/object_with_deprecated_fields.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/object_with_deprecated_fields.py index e3bae640cdb7..cc2fa540829a 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/object_with_deprecated_fields.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/object_with_deprecated_fields.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.deprecated_object import DeprecatedObject -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectWithDeprecatedFields(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/one_of_enum_string.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/one_of_enum_string.py index 53101c37cc8b..6d218d95f0ee 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/one_of_enum_string.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/one_of_enum_string.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OneOfEnumString(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/order.py index 0cd26ab72b34..4d6119c41528 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/order.py @@ -20,8 +20,7 @@ from datetime import datetime from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Order(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/other.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/other.py index 2f8d6ca1a282..ecb546af522d 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/other.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/other.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Other(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_composite.py index 05186f8015e6..e557a82b88ed 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_composite.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_composite.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterComposite(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum.py index ac48cc0dc4d8..1fed9a89a8be 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_default_value.py index 99d6fd5fc042..c9d2ddb32476 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_default_value.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumDefaultValue(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_integer.py index b771b7a61f55..b081e13fcd88 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_integer.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_integer.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumInteger(int, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_integer_default_value.py index 8df41b2bd320..3b4b3f98baf3 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_integer_default_value.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_enum_integer_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumIntegerDefaultValue(int, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_object_with_enum_property.py index b73faea2c909..e85d171a0c52 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_object_with_enum_property.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.outer_enum import OuterEnum from petstore_api.models.outer_enum_integer import OuterEnumInteger -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterObjectWithEnumProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/parent.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/parent.py index 6d952bc4d557..8e19d7e32640 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/parent.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/parent.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Parent(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/parent_with_optional_dict.py index 073836419245..5eac820c0419 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/parent_with_optional_dict.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/parent_with_optional_dict.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ParentWithOptionalDict(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pet.py index ad545ecdd848..8eda9c00645e 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pet.py @@ -18,12 +18,10 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Pet(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pig.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pig.py index b3a759e89b7b..34be33810ce4 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pig.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pig.py @@ -20,8 +20,7 @@ from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pony_sizes.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pony_sizes.py index c70683def48d..3de54fc29c0f 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pony_sizes.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pony_sizes.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.type import Type -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PonySizes(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/poop_cleaning.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/poop_cleaning.py index 3733c7bd9b00..c3804564c5ee 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/poop_cleaning.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/poop_cleaning.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PoopCleaning(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/primitive_string.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/primitive_string.py index f23b8503d855..87f40de6c848 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/primitive_string.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/primitive_string.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PrimitiveString(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/property_map.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/property_map.py index e34512b98d55..486ad4da59db 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/property_map.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/property_map.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyMap(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/property_name_collision.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/property_name_collision.py index bca5de5f58fd..8c863057996e 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/property_name_collision.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/property_name_collision.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyNameCollision(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/read_only_first.py index e22fac10b2b5..b9f371f417a7 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/read_only_first.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/read_only_first.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ReadOnlyFirst(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/second_circular_all_of_ref.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/second_circular_all_of_ref.py index d8112af7e452..f41c27b6055d 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/second_circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/second_circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondCircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/second_ref.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/second_ref.py index 69eb99fad636..3a4c16010cfb 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/second_ref.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/second_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/self_reference_model.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/self_reference_model.py index fb84a0573dba..ccefa2c304bc 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/self_reference_model.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/self_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SelfReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/single_ref_type.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/single_ref_type.py index 91ab07e2535c..7e2f76951095 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/single_ref_type.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/single_ref_type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SingleRefType(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_character_enum.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_character_enum.py index 1d85fd148d4b..f2c71ebefd03 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_character_enum.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_character_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SpecialCharacterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_model_name.py index 4188827e69e7..4e2ce035b15c 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_model_name.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_model_name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialModelName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_name.py index 432acdbdb90a..5cd2af624d85 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_name.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tag.py index 5dbba0015e8b..55e67da5a1a2 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tag.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tag.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tag(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tagged_union.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tagged_union.py index 2930dd983976..e437fbf51699 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tagged_union.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tagged_union.py @@ -20,8 +20,7 @@ from petstore_api.models.known import Known from petstore_api.models.other import Other from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TAGGEDUNION_ONE_OF_SCHEMAS = ["Known", "Other"] diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/task.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/task.py index e926f4c275d5..8f4bc6dee626 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/task.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/task.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List from uuid import UUID from petstore_api.models.task_activity import TaskActivity -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Task(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/task_activity.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/task_activity.py index cc1e1fc5a60f..f0541228a580 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/task_activity.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/task_activity.py @@ -21,8 +21,7 @@ from petstore_api.models.feeding import Feeding from petstore_api.models.poop_cleaning import PoopCleaning from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"] diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_enum.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_enum.py index 8eae227a84e9..b19bdb08cd26 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_enum.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_enum_with_default.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_enum_with_default.py index 9304d3ab8497..bf63e480a080 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_enum_with_default.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_enum_with_default.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnumWithDefault(str, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_error_responses_with_model400_response.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_error_responses_with_model400_response.py index 6f4bba183ee4..addb55fd988d 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_error_responses_with_model400_response.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_error_responses_with_model400_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel400Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_error_responses_with_model404_response.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_error_responses_with_model404_response.py index 16b242b56b71..22df2bab0a88 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_error_responses_with_model404_response.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_error_responses_with_model404_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel404Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_inline_freeform_additional_properties_request.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_inline_freeform_additional_properties_request.py index 67f893c75448..9d71d50bded5 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_inline_freeform_additional_properties_request.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_inline_freeform_additional_properties_request.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestInlineFreeformAdditionalPropertiesRequest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_model_with_enum_default.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_model_with_enum_default.py index de1fd02f0228..9fed49b5df8e 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_model_with_enum_default.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_model_with_enum_default.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.test_enum import TestEnum from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestModelWithEnumDefault(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_object_for_multipart_requests_request_marker.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_object_for_multipart_requests_request_marker.py index e1b5959f69d1..726a6468810b 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_object_for_multipart_requests_request_marker.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_object_for_multipart_requests_request_marker.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestObjectForMultipartRequestsRequestMarker(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tiger.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tiger.py index c1f7eebcb138..0ec4d943f4b3 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tiger.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tiger.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tiger(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/type.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/type.py index 35a847de894f..67d39ce69af6 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/type.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class Type(int, Enum): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py index 100b8df77e60..ca46efe057ef 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalModelListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py index 78d19e89e0e7..555c5f98a6bd 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalStringListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/upload_file_with_additional_properties_request_object.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/upload_file_with_additional_properties_request_object.py index 02ccb0a8c689..f6509fddeaf8 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/upload_file_with_additional_properties_request_object.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/upload_file_with_additional_properties_request_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UploadFileWithAdditionalPropertiesRequestObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/user.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/user.py index 624e5c2135c4..dc6d4bff158b 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/user.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/user.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class User(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/uuid_with_pattern.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/uuid_with_pattern.py index 31c7b3567a6c..da371f9cb2a4 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/uuid_with_pattern.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/uuid_with_pattern.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, field_validator from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UuidWithPattern(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/with_nested_one_of.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/with_nested_one_of.py index c85fa5963a75..2dcc2402225b 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/with_nested_one_of.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/with_nested_one_of.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.one_of_enum_string import OneOfEnumString from petstore_api.models.pig import Pig -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class WithNestedOneOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-aiohttp/pyproject.toml b/samples/openapi3/client/petstore/python-aiohttp/pyproject.toml index bcf671a77754..a904bb3ff186 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/pyproject.toml +++ b/samples/openapi3/client/petstore/python-aiohttp/pyproject.toml @@ -17,7 +17,6 @@ aiohttp-retry = ">= 2.8.3" pem = ">= 19.3.0" pycryptodome = ">= 3.9.0" pydantic = ">= 2.11" -typing-extensions = ">= 4.7.1" # Deprecated by Poetry; retained for compatibility with legacy Poetry 1 releases. [tool.poetry.dev-dependencies] pytest = ">= 9.0.3" diff --git a/samples/openapi3/client/petstore/python-aiohttp/requirements.txt b/samples/openapi3/client/petstore/python-aiohttp/requirements.txt index baeace9e16c0..f47ba8442581 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/requirements.txt +++ b/samples/openapi3/client/petstore/python-aiohttp/requirements.txt @@ -4,4 +4,3 @@ aiohttp-retry >= 2.8.3 pem >= 19.3.0 pycryptodome >= 3.9.0 pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/samples/openapi3/client/petstore/python-aiohttp/setup.py b/samples/openapi3/client/petstore/python-aiohttp/setup.py index 662f156c19cf..f172088b42ab 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/setup.py +++ b/samples/openapi3/client/petstore/python-aiohttp/setup.py @@ -28,7 +28,6 @@ "pem >= 19.3.0", "pycryptodome >= 3.9.0", "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/another_fake_api.py index 3e70d5e8c536..aae076c9d6f5 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/another_fake_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/default_api.py index 0044d1e0287c..4c9e7f598200 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/default_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from petstore_api.models.foo_get_default_response import FooGetDefaultResponse diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/fake_api.py index 4a6f7b7183da..2d98066ca44b 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/fake_api.py @@ -13,13 +13,11 @@ import json import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import date, datetime from pydantic import Field, StrictBool, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from uuid import UUID from petstore_api.models.client import Client from petstore_api.models.enum_class import EnumClass diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/fake_classname_tags123_api.py index da4d328c100f..c3dafa3e5628 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/fake_classname_tags123_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/import_test_datetime_api.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/import_test_datetime_api.py index fd933e5180e0..ca6b2eb7b9da 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/import_test_datetime_api.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/import_test_datetime_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import datetime diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/pet_api.py index d304e3fba145..0a2805f52295 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/pet_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, List, Optional, Tuple, Union from petstore_api.models.model_api_response import ModelApiResponse from petstore_api.models.pet import Pet diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/store_api.py index b6c56870658d..636118e714cd 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/store_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictInt, StrictStr -from typing import Dict -from typing_extensions import Annotated +from typing import Annotated, Dict from petstore_api.models.order import Order from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/user_api.py index d07e94b739fe..6d2d24a93ec6 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/api/user_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictStr -from typing import List -from typing_extensions import Annotated +from typing import Annotated, List from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/configuration.py index cefa6fa3a1f9..26bacd087c51 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/configuration.py @@ -16,8 +16,7 @@ import logging from logging import FileHandler import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union -from typing_extensions import NotRequired, Self +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union from petstore_api.signing import HttpSigningConfiguration diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/exceptions.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/exceptions.py index 8e7fcf82d538..d978c12f2b67 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/exceptions.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/exceptions.py @@ -10,8 +10,7 @@ """ # noqa: E501 -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_any_type.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_any_type.py index 19db20137bc4..195345309ff3 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_any_type.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_any_type.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesAnyType(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_class.py index c305a68c725f..5f9d21f2697d 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.pet import Pet -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_object.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_object.py index d23fd87e51f3..41c2b4aea078 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_object.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_with_description_only.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_with_description_only.py index b1f42400b676..197648ee0a36 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_with_description_only.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/additional_properties_with_description_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesWithDescriptionOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/all_of_super_model.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/all_of_super_model.py index 4793b8e4b3cd..b8dcac0f1e64 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/all_of_super_model.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/all_of_super_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfSuperModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/all_of_with_single_ref.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/all_of_with_single_ref.py index 34e4c3dca7ea..07f66ebe8325 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/all_of_with_single_ref.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/all_of_with_single_ref.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.single_ref_type import SingleRefType -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfWithSingleRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/animal.py index 7337a96aa42c..7e54b4d6fd45 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/animal.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/animal.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/any_of_color.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/any_of_color.py index f6d277e79498..4bcb6a751c30 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/any_of_color.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/any_of_color.py @@ -18,10 +18,8 @@ import pprint import re # noqa: F401 from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import List, Optional -from typing_extensions import Annotated -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Annotated, List, Optional +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/any_of_pig.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/any_of_pig.py index c949e136f415..ba66686bc9c8 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/any_of_pig.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/any_of_pig.py @@ -21,8 +21,7 @@ from typing import Optional from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_array_of_model.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_array_of_model.py index 896229b2570a..213bc1d38660 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_array_of_number_only.py index 3fb0fb5056f6..d39c0be8858d 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_map_model.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_map_model.py index 8e03d5766e33..568f99edfcba 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_map_model.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_map_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfMapModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_number_only.py index 12b045326e11..f1803a5f12b4 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_test.py index bb80aa6ab77d..f28889ed5fcf 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_test.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/array_test.py @@ -18,11 +18,9 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.read_only_first import ReadOnlyFirst -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/base_discriminator.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/base_discriminator.py index 955dd21246d4..f313f3477ce6 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/base_discriminator.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/base_discriminator.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/basque_pig.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/basque_pig.py index b279e5a53e14..58f4a8eeac7e 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/basque_pig.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/basque_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class BasquePig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/bathing.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/bathing.py index 46b35c700e2b..a1d5a741d26b 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/bathing.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/bathing.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Bathing(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/capitalization.py index f4af4f06f207..6996d6a337e7 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/capitalization.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/capitalization.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Capitalization(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/cat.py index 8692ceebb9a6..23269ba1d6c4 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/cat.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/cat.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictBool from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Cat(Animal): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/category.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/category.py index f7d60fe80c03..67f22394fda5 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/category.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/category.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Category(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/circular_all_of_ref.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/circular_all_of_ref.py index 69d6cfd2bdf4..749f48312086 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/circular_reference_model.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/circular_reference_model.py index f43b0863da44..61efdad97c65 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/circular_reference_model.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/circular_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/class_model.py index 331958d9b209..6903989abf92 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/class_model.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/class_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ClassModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/client.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/client.py index cdbddee56d31..148f480265fe 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/client.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/client.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Client(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/color.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/color.py index bb740fb597d4..6d69a03f9b2e 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/color.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/color.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/creature.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/creature.py index 29cfc5e5f56c..776dfb8d7d8b 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/creature.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/creature.py @@ -21,8 +21,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Union from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/creature_info.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/creature_info.py index 2488eca5d562..ba753358b553 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/creature_info.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/creature_info.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CreatureInfo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/danish_pig.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/danish_pig.py index ad3e5496cbd1..26200765c775 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/danish_pig.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/danish_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DanishPig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/data_output_format.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/data_output_format.py index ee3df76c5169..af7b5d212fc2 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/data_output_format.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/data_output_format.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class DataOutputFormat(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/deprecated_object.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/deprecated_object.py index 0c09f54f0e91..1c1190b7d9f1 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/deprecated_object.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/deprecated_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DeprecatedObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/discriminator_all_of_sub.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/discriminator_all_of_sub.py index f5a0aa665e7f..ab29addbb172 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/discriminator_all_of_sub.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/discriminator_all_of_sub.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DiscriminatorAllOfSub(DiscriminatorAllOfSuper): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/discriminator_all_of_super.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/discriminator_all_of_super.py index 275312d713ad..74faf8314dba 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/discriminator_all_of_super.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/discriminator_all_of_super.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/dog.py index b8752a1f948f..4fe37d2b44c1 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/dog.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/dog.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Dog(Animal): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/dummy_model.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/dummy_model.py index 19a8109a056d..8ccb3d483c0d 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/dummy_model.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/dummy_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DummyModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_arrays.py index d841ea10e5b8..c56e880111b0 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_arrays.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_class.py index 1ba5af8036df..8d4effa9573a 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_class.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_class.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumClass(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_number_vendor_ext.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_number_vendor_ext.py index 5588de5c7043..a7e98fb3b521 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_number_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_number_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumNumberVendorExt(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_ref_with_default_value.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_ref_with_default_value.py index 5c29c04aa7f2..e4a77e52206d 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_ref_with_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_ref_with_default_value.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.data_output_format import DataOutputFormat -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumRefWithDefaultValue(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string1.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string1.py index 678b4e12661f..e14b8e930b6a 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string1.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string1.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString1(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string2.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string2.py index a959f554e0af..9f8f6c0fc0eb 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string2.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string2.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString2(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string_vendor_ext.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string_vendor_ext.py index 821812e9b088..a94b2a9afa35 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_string_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumStringVendorExt(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_test.py index 604194529754..c5674e26b58b 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/enum_test.py @@ -25,8 +25,7 @@ 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 typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/feeding.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/feeding.py index ce5a36f49afb..d1ca63749b8a 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/feeding.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/feeding.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Feeding(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/file.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/file.py index 7d8d010f8c82..7ed84d23410b 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/file.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/file.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class File(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/file_schema_test_class.py index 5e8ca6861d83..5c9924850f5c 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/file_schema_test_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FileSchemaTestClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/first_ref.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/first_ref.py index 5c03477f15f0..8dd448e7c018 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/first_ref.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/first_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FirstRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/foo.py index 65a289e187de..108169a3f140 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/foo.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/foo.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Foo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/foo_get_default_response.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/foo_get_default_response.py index e3a3f7a66aed..b0d11fa1976a 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/foo_get_default_response.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/foo_get_default_response.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.foo import Foo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FooGetDefaultResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/format_test.py index 92f3cacf7f91..2bc43ade9948 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/format_test.py @@ -20,11 +20,9 @@ from datetime import date, datetime from decimal import Decimal from pydantic import BaseModel, ConfigDict, Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional, Tuple, Union from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FormatTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/has_only_read_only.py index c7a1c9f0913e..ec8ece81be5e 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/has_only_read_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HasOnlyReadOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/header_arg.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/header_arg.py index bd8d1b0090ed..553fe8105251 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/header_arg.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/header_arg.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HeaderArg(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/health_check_result.py index 270725757bad..df0360f75353 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/health_check_result.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HealthCheckResult(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/hunting_dog.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/hunting_dog.py index 4064ce67183c..43a54e233de3 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/hunting_dog.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/hunting_dog.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature import Creature from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HuntingDog(Creature): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/info.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/info.py index 0f57b71af2aa..040b9ea8c185 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/info.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/info.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Info(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/inner_dict_with_property.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/inner_dict_with_property.py index 9b709fb15e43..67abdb430ff1 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/inner_dict_with_property.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/inner_dict_with_property.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InnerDictWithProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/input_all_of.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/input_all_of.py index e03dd4fc3839..61bc42bb9ae2 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/input_all_of.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/input_all_of.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InputAllOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/int_or_string.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/int_or_string.py index f2a5a0a2d4a3..4343951a010d 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/int_or_string.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/int_or_string.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/known.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/known.py index daf64e57b96d..6508435d7c0d 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/known.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/known.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Known(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/list_class.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/list_class.py index 634b8d012d29..f4217e29aa95 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/list_class.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/list_class.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ListClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/map_of_array_of_model.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/map_of_array_of_model.py index e22e38fe0b59..e57d8166ea4e 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/map_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/map_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/map_test.py index ac4080efbc88..c54debde848c 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/map_test.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/mixed_properties_and_additional_properties_class.py index 20091d09ce86..51081afdaad5 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -22,8 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model200_response.py index 63c9faad21f5..eaeccd5fc6d7 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model200_response.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model200_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Model200Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_api_response.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_api_response.py index 517441e5d545..e81f467aeb7a 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_api_response.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_api_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelApiResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_field.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_field.py index 80951622bed4..648b750801e5 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_field.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_field.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelField(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_return.py index 374b0b454781..6637cfd373cd 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_return.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/model_return.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelReturn(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/multi_arrays.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/multi_arrays.py index 00d62ef2df3e..2aa3a0d03398 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/multi_arrays.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/multi_arrays.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MultiArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/name.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/name.py index 9b4f7a436ed6..53ec70e661b6 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/name.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Name(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/nullable_class.py index 25c6ba3d4d39..ff2f4c651c33 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/nullable_class.py @@ -20,8 +20,7 @@ from datetime import date, datetime from pydantic import BaseModel, ConfigDict, StrictBool, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/nullable_property.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/nullable_property.py index 819cc52809b9..95373a2be755 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/nullable_property.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/nullable_property.py @@ -18,10 +18,8 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated -from typing import Optional, Set -from typing_extensions import Self +from typing import Annotated, Any, ClassVar, Dict, List, Optional +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/number_only.py index b91b8d045003..41accc1a9d40 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/number_only.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/object_to_test_additional_properties.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/object_to_test_additional_properties.py index 2ac8a9d37a2c..1e2ea9923997 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/object_to_test_additional_properties.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/object_to_test_additional_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectToTestAdditionalProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/object_with_deprecated_fields.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/object_with_deprecated_fields.py index e3bae640cdb7..cc2fa540829a 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/object_with_deprecated_fields.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/object_with_deprecated_fields.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.deprecated_object import DeprecatedObject -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectWithDeprecatedFields(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/one_of_enum_string.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/one_of_enum_string.py index 53101c37cc8b..6d218d95f0ee 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/one_of_enum_string.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/one_of_enum_string.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OneOfEnumString(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/order.py index 0cd26ab72b34..4d6119c41528 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/order.py @@ -20,8 +20,7 @@ from datetime import datetime from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Order(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/other.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/other.py index 2f8d6ca1a282..ecb546af522d 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/other.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/other.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Other(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_composite.py index 05186f8015e6..e557a82b88ed 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_composite.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_composite.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterComposite(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum.py index ac48cc0dc4d8..1fed9a89a8be 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_default_value.py index 99d6fd5fc042..c9d2ddb32476 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumDefaultValue(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_integer.py index b771b7a61f55..b081e13fcd88 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_integer.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_integer.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumInteger(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_integer_default_value.py index 8df41b2bd320..3b4b3f98baf3 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_integer_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_enum_integer_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumIntegerDefaultValue(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_object_with_enum_property.py index b73faea2c909..e85d171a0c52 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/outer_object_with_enum_property.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.outer_enum import OuterEnum from petstore_api.models.outer_enum_integer import OuterEnumInteger -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterObjectWithEnumProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/parent.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/parent.py index 6d952bc4d557..8e19d7e32640 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/parent.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/parent.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Parent(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/parent_with_optional_dict.py index 073836419245..5eac820c0419 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/parent_with_optional_dict.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/parent_with_optional_dict.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ParentWithOptionalDict(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pet.py index ad545ecdd848..8eda9c00645e 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pet.py @@ -18,12 +18,10 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Pet(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pig.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pig.py index b3a759e89b7b..34be33810ce4 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pig.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pig.py @@ -20,8 +20,7 @@ from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pony_sizes.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pony_sizes.py index c70683def48d..3de54fc29c0f 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pony_sizes.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/pony_sizes.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.type import Type -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PonySizes(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/poop_cleaning.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/poop_cleaning.py index 3733c7bd9b00..c3804564c5ee 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/poop_cleaning.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/poop_cleaning.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PoopCleaning(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/primitive_string.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/primitive_string.py index f23b8503d855..87f40de6c848 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/primitive_string.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/primitive_string.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PrimitiveString(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/property_map.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/property_map.py index e34512b98d55..486ad4da59db 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/property_map.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/property_map.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyMap(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/property_name_collision.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/property_name_collision.py index bca5de5f58fd..8c863057996e 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/property_name_collision.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/property_name_collision.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyNameCollision(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/read_only_first.py index e22fac10b2b5..b9f371f417a7 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/read_only_first.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/read_only_first.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ReadOnlyFirst(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/second_circular_all_of_ref.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/second_circular_all_of_ref.py index d8112af7e452..f41c27b6055d 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/second_circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/second_circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondCircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/second_ref.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/second_ref.py index 69eb99fad636..3a4c16010cfb 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/second_ref.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/second_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/self_reference_model.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/self_reference_model.py index fb84a0573dba..ccefa2c304bc 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/self_reference_model.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/self_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SelfReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/single_ref_type.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/single_ref_type.py index 91ab07e2535c..7e2f76951095 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/single_ref_type.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/single_ref_type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SingleRefType(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_character_enum.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_character_enum.py index 1d85fd148d4b..f2c71ebefd03 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_character_enum.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_character_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SpecialCharacterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_model_name.py index 4188827e69e7..4e2ce035b15c 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_model_name.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_model_name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialModelName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_name.py index 432acdbdb90a..5cd2af624d85 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/special_name.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tag.py index 5dbba0015e8b..55e67da5a1a2 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tag.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tag.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tag(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tagged_union.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tagged_union.py index 2930dd983976..e437fbf51699 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tagged_union.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tagged_union.py @@ -20,8 +20,7 @@ from petstore_api.models.known import Known from petstore_api.models.other import Other from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TAGGEDUNION_ONE_OF_SCHEMAS = ["Known", "Other"] diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/task.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/task.py index e926f4c275d5..8f4bc6dee626 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/task.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/task.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List from uuid import UUID from petstore_api.models.task_activity import TaskActivity -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Task(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/task_activity.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/task_activity.py index cc1e1fc5a60f..f0541228a580 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/task_activity.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/task_activity.py @@ -21,8 +21,7 @@ from petstore_api.models.feeding import Feeding from petstore_api.models.poop_cleaning import PoopCleaning from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"] diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_enum.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_enum.py index 8eae227a84e9..b19bdb08cd26 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_enum.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_enum_with_default.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_enum_with_default.py index 9304d3ab8497..bf63e480a080 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_enum_with_default.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_enum_with_default.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnumWithDefault(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_error_responses_with_model400_response.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_error_responses_with_model400_response.py index 6f4bba183ee4..addb55fd988d 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_error_responses_with_model400_response.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_error_responses_with_model400_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel400Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_error_responses_with_model404_response.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_error_responses_with_model404_response.py index 16b242b56b71..22df2bab0a88 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_error_responses_with_model404_response.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_error_responses_with_model404_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel404Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_inline_freeform_additional_properties_request.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_inline_freeform_additional_properties_request.py index 67f893c75448..9d71d50bded5 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_inline_freeform_additional_properties_request.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_inline_freeform_additional_properties_request.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestInlineFreeformAdditionalPropertiesRequest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_model_with_enum_default.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_model_with_enum_default.py index de1fd02f0228..9fed49b5df8e 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_model_with_enum_default.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_model_with_enum_default.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.test_enum import TestEnum from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestModelWithEnumDefault(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_object_for_multipart_requests_request_marker.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_object_for_multipart_requests_request_marker.py index e1b5959f69d1..726a6468810b 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_object_for_multipart_requests_request_marker.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/test_object_for_multipart_requests_request_marker.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestObjectForMultipartRequestsRequestMarker(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tiger.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tiger.py index c1f7eebcb138..0ec4d943f4b3 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tiger.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/tiger.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tiger(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/type.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/type.py index 35a847de894f..67d39ce69af6 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/type.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class Type(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py index 100b8df77e60..ca46efe057ef 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalModelListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py index 78d19e89e0e7..555c5f98a6bd 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalStringListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/upload_file_with_additional_properties_request_object.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/upload_file_with_additional_properties_request_object.py index 02ccb0a8c689..f6509fddeaf8 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/upload_file_with_additional_properties_request_object.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/upload_file_with_additional_properties_request_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UploadFileWithAdditionalPropertiesRequestObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/user.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/user.py index 624e5c2135c4..dc6d4bff158b 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/user.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/user.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class User(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/uuid_with_pattern.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/uuid_with_pattern.py index 31c7b3567a6c..da371f9cb2a4 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/uuid_with_pattern.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/uuid_with_pattern.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, field_validator from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UuidWithPattern(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/with_nested_one_of.py b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/with_nested_one_of.py index c85fa5963a75..2dcc2402225b 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/with_nested_one_of.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/petstore_api/models/with_nested_one_of.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.one_of_enum_string import OneOfEnumString from petstore_api.models.pig import Pig -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class WithNestedOneOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx-sync/pyproject.toml b/samples/openapi3/client/petstore/python-httpx-sync/pyproject.toml index 15b2a10b849b..0e714a86db48 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/pyproject.toml +++ b/samples/openapi3/client/petstore/python-httpx-sync/pyproject.toml @@ -16,7 +16,6 @@ dependencies = [ "pem (>=19.3.0)", "pycryptodome (>=3.9.0)", "pydantic (>=2.11)", - "typing-extensions (>=4.7.1)", ] [project.urls] diff --git a/samples/openapi3/client/petstore/python-httpx-sync/requirements.txt b/samples/openapi3/client/petstore/python-httpx-sync/requirements.txt index 5aad1e2102b5..06fcf20a99e5 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/requirements.txt +++ b/samples/openapi3/client/petstore/python-httpx-sync/requirements.txt @@ -3,4 +3,3 @@ httpx >= 0.28.1 pem >= 19.3.0 pycryptodome >= 3.9.0 pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/samples/openapi3/client/petstore/python-httpx-sync/setup.py b/samples/openapi3/client/petstore/python-httpx-sync/setup.py index e3fbfe697e5a..82b09d7dd5ac 100644 --- a/samples/openapi3/client/petstore/python-httpx-sync/setup.py +++ b/samples/openapi3/client/petstore/python-httpx-sync/setup.py @@ -27,7 +27,6 @@ "pem >= 19.3.0", "pycryptodome >= 3.9.0", "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/another_fake_api.py index 968ac5d448d0..2d3eaa77b18a 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/another_fake_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/default_api.py index 5a766861f81f..62a1772a2875 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/default_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from petstore_api.models.foo_get_default_response import FooGetDefaultResponse diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py index 8c7dc59ccaac..1880c7af2ba6 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py @@ -13,13 +13,11 @@ import json import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import date, datetime from pydantic import Field, StrictBool, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from uuid import UUID from petstore_api.models.client import Client from petstore_api.models.enum_class import EnumClass diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_classname_tags123_api.py index 9e6aeb9ed9c9..1366e692e407 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_classname_tags123_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/import_test_datetime_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/import_test_datetime_api.py index 9dbb9cd39e69..4c8a6d678cd5 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/import_test_datetime_api.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/import_test_datetime_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import datetime diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/pet_api.py index 92b61d5dcbad..03ac8468c6d5 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/pet_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, List, Optional, Tuple, Union from petstore_api.models.model_api_response import ModelApiResponse from petstore_api.models.pet import Pet diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/store_api.py index 5b7543c1b285..9d7f4ed62c59 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/store_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictInt, StrictStr -from typing import Dict -from typing_extensions import Annotated +from typing import Annotated, Dict from petstore_api.models.order import Order from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/user_api.py index 387ff3f12e8d..c7b5228e0d2e 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/user_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictStr -from typing import List -from typing_extensions import Annotated +from typing import Annotated, List from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/configuration.py index cefa6fa3a1f9..26bacd087c51 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/configuration.py @@ -16,8 +16,7 @@ import logging from logging import FileHandler import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union -from typing_extensions import NotRequired, Self +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union from petstore_api.signing import HttpSigningConfiguration diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/exceptions.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/exceptions.py index 8e7fcf82d538..d978c12f2b67 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/exceptions.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/exceptions.py @@ -10,8 +10,7 @@ """ # noqa: E501 -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_any_type.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_any_type.py index 19db20137bc4..195345309ff3 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_any_type.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_any_type.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesAnyType(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_class.py index c305a68c725f..5f9d21f2697d 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.pet import Pet -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_object.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_object.py index d23fd87e51f3..41c2b4aea078 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_object.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_with_description_only.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_with_description_only.py index b1f42400b676..197648ee0a36 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_with_description_only.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/additional_properties_with_description_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesWithDescriptionOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/all_of_super_model.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/all_of_super_model.py index 4793b8e4b3cd..b8dcac0f1e64 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/all_of_super_model.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/all_of_super_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfSuperModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/all_of_with_single_ref.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/all_of_with_single_ref.py index 34e4c3dca7ea..07f66ebe8325 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/all_of_with_single_ref.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/all_of_with_single_ref.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.single_ref_type import SingleRefType -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfWithSingleRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/animal.py index 7337a96aa42c..7e54b4d6fd45 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/animal.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/animal.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/any_of_color.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/any_of_color.py index f6d277e79498..4bcb6a751c30 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/any_of_color.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/any_of_color.py @@ -18,10 +18,8 @@ import pprint import re # noqa: F401 from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import List, Optional -from typing_extensions import Annotated -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Annotated, List, Optional +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/any_of_pig.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/any_of_pig.py index c949e136f415..ba66686bc9c8 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/any_of_pig.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/any_of_pig.py @@ -21,8 +21,7 @@ from typing import Optional from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_array_of_model.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_array_of_model.py index 896229b2570a..213bc1d38660 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_array_of_number_only.py index 3fb0fb5056f6..d39c0be8858d 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_map_model.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_map_model.py index 8e03d5766e33..568f99edfcba 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_map_model.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_map_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfMapModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_number_only.py index 12b045326e11..f1803a5f12b4 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_test.py index bb80aa6ab77d..f28889ed5fcf 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_test.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/array_test.py @@ -18,11 +18,9 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.read_only_first import ReadOnlyFirst -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/base_discriminator.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/base_discriminator.py index 955dd21246d4..f313f3477ce6 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/base_discriminator.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/base_discriminator.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/basque_pig.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/basque_pig.py index b279e5a53e14..58f4a8eeac7e 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/basque_pig.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/basque_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class BasquePig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/bathing.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/bathing.py index 46b35c700e2b..a1d5a741d26b 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/bathing.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/bathing.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Bathing(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/capitalization.py index f4af4f06f207..6996d6a337e7 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/capitalization.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/capitalization.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Capitalization(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/cat.py index 8692ceebb9a6..23269ba1d6c4 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/cat.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/cat.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictBool from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Cat(Animal): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/category.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/category.py index f7d60fe80c03..67f22394fda5 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/category.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/category.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Category(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/circular_all_of_ref.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/circular_all_of_ref.py index 69d6cfd2bdf4..749f48312086 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/circular_reference_model.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/circular_reference_model.py index f43b0863da44..61efdad97c65 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/circular_reference_model.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/circular_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/class_model.py index 331958d9b209..6903989abf92 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/class_model.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/class_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ClassModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/client.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/client.py index cdbddee56d31..148f480265fe 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/client.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/client.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Client(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/color.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/color.py index bb740fb597d4..6d69a03f9b2e 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/color.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/color.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/creature.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/creature.py index 29cfc5e5f56c..776dfb8d7d8b 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/creature.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/creature.py @@ -21,8 +21,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Union from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/creature_info.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/creature_info.py index 2488eca5d562..ba753358b553 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/creature_info.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/creature_info.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CreatureInfo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/danish_pig.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/danish_pig.py index ad3e5496cbd1..26200765c775 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/danish_pig.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/danish_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DanishPig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/data_output_format.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/data_output_format.py index ee3df76c5169..af7b5d212fc2 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/data_output_format.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/data_output_format.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class DataOutputFormat(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/deprecated_object.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/deprecated_object.py index 0c09f54f0e91..1c1190b7d9f1 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/deprecated_object.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/deprecated_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DeprecatedObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/discriminator_all_of_sub.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/discriminator_all_of_sub.py index f5a0aa665e7f..ab29addbb172 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/discriminator_all_of_sub.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/discriminator_all_of_sub.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DiscriminatorAllOfSub(DiscriminatorAllOfSuper): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/discriminator_all_of_super.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/discriminator_all_of_super.py index 275312d713ad..74faf8314dba 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/discriminator_all_of_super.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/discriminator_all_of_super.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/dog.py index b8752a1f948f..4fe37d2b44c1 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/dog.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/dog.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Dog(Animal): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/dummy_model.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/dummy_model.py index 19a8109a056d..8ccb3d483c0d 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/dummy_model.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/dummy_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DummyModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_arrays.py index d841ea10e5b8..c56e880111b0 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_arrays.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_class.py index 1ba5af8036df..8d4effa9573a 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_class.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_class.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumClass(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_number_vendor_ext.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_number_vendor_ext.py index 5588de5c7043..a7e98fb3b521 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_number_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_number_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumNumberVendorExt(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_ref_with_default_value.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_ref_with_default_value.py index 5c29c04aa7f2..e4a77e52206d 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_ref_with_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_ref_with_default_value.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.data_output_format import DataOutputFormat -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumRefWithDefaultValue(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string1.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string1.py index 678b4e12661f..e14b8e930b6a 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string1.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string1.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString1(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string2.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string2.py index a959f554e0af..9f8f6c0fc0eb 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string2.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string2.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString2(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string_vendor_ext.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string_vendor_ext.py index 821812e9b088..a94b2a9afa35 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_string_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumStringVendorExt(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_test.py index 604194529754..c5674e26b58b 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/enum_test.py @@ -25,8 +25,7 @@ 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 typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/feeding.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/feeding.py index ce5a36f49afb..d1ca63749b8a 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/feeding.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/feeding.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Feeding(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/file.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/file.py index 7d8d010f8c82..7ed84d23410b 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/file.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/file.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class File(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/file_schema_test_class.py index 5e8ca6861d83..5c9924850f5c 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/file_schema_test_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FileSchemaTestClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/first_ref.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/first_ref.py index 5c03477f15f0..8dd448e7c018 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/first_ref.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/first_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FirstRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/foo.py index 65a289e187de..108169a3f140 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/foo.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/foo.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Foo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/foo_get_default_response.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/foo_get_default_response.py index e3a3f7a66aed..b0d11fa1976a 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/foo_get_default_response.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/foo_get_default_response.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.foo import Foo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FooGetDefaultResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/format_test.py index 92f3cacf7f91..2bc43ade9948 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/format_test.py @@ -20,11 +20,9 @@ from datetime import date, datetime from decimal import Decimal from pydantic import BaseModel, ConfigDict, Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional, Tuple, Union from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FormatTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/has_only_read_only.py index c7a1c9f0913e..ec8ece81be5e 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/has_only_read_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HasOnlyReadOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/header_arg.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/header_arg.py index bd8d1b0090ed..553fe8105251 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/header_arg.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/header_arg.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HeaderArg(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/health_check_result.py index 270725757bad..df0360f75353 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/health_check_result.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HealthCheckResult(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/hunting_dog.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/hunting_dog.py index 4064ce67183c..43a54e233de3 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/hunting_dog.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/hunting_dog.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature import Creature from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HuntingDog(Creature): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/info.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/info.py index 0f57b71af2aa..040b9ea8c185 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/info.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/info.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Info(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/inner_dict_with_property.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/inner_dict_with_property.py index 9b709fb15e43..67abdb430ff1 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/inner_dict_with_property.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/inner_dict_with_property.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InnerDictWithProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/input_all_of.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/input_all_of.py index e03dd4fc3839..61bc42bb9ae2 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/input_all_of.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/input_all_of.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InputAllOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/int_or_string.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/int_or_string.py index f2a5a0a2d4a3..4343951a010d 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/int_or_string.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/int_or_string.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/known.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/known.py index daf64e57b96d..6508435d7c0d 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/known.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/known.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Known(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/list_class.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/list_class.py index 634b8d012d29..f4217e29aa95 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/list_class.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/list_class.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ListClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/map_of_array_of_model.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/map_of_array_of_model.py index e22e38fe0b59..e57d8166ea4e 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/map_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/map_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/map_test.py index ac4080efbc88..c54debde848c 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/map_test.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/mixed_properties_and_additional_properties_class.py index 20091d09ce86..51081afdaad5 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -22,8 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model200_response.py index 63c9faad21f5..eaeccd5fc6d7 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model200_response.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model200_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Model200Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_api_response.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_api_response.py index 517441e5d545..e81f467aeb7a 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_api_response.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_api_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelApiResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_field.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_field.py index 80951622bed4..648b750801e5 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_field.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_field.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelField(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_return.py index 374b0b454781..6637cfd373cd 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_return.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/model_return.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelReturn(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/multi_arrays.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/multi_arrays.py index 00d62ef2df3e..2aa3a0d03398 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/multi_arrays.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/multi_arrays.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MultiArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/name.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/name.py index 9b4f7a436ed6..53ec70e661b6 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/name.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Name(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/nullable_class.py index 25c6ba3d4d39..ff2f4c651c33 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/nullable_class.py @@ -20,8 +20,7 @@ from datetime import date, datetime from pydantic import BaseModel, ConfigDict, StrictBool, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/nullable_property.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/nullable_property.py index 819cc52809b9..95373a2be755 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/nullable_property.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/nullable_property.py @@ -18,10 +18,8 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated -from typing import Optional, Set -from typing_extensions import Self +from typing import Annotated, Any, ClassVar, Dict, List, Optional +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/number_only.py index b91b8d045003..41accc1a9d40 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/number_only.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/object_to_test_additional_properties.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/object_to_test_additional_properties.py index 2ac8a9d37a2c..1e2ea9923997 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/object_to_test_additional_properties.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/object_to_test_additional_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectToTestAdditionalProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/object_with_deprecated_fields.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/object_with_deprecated_fields.py index e3bae640cdb7..cc2fa540829a 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/object_with_deprecated_fields.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/object_with_deprecated_fields.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.deprecated_object import DeprecatedObject -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectWithDeprecatedFields(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/one_of_enum_string.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/one_of_enum_string.py index 53101c37cc8b..6d218d95f0ee 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/one_of_enum_string.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/one_of_enum_string.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OneOfEnumString(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/order.py index 0cd26ab72b34..4d6119c41528 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/order.py @@ -20,8 +20,7 @@ from datetime import datetime from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Order(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/other.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/other.py index 2f8d6ca1a282..ecb546af522d 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/other.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/other.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Other(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_composite.py index 05186f8015e6..e557a82b88ed 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_composite.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_composite.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterComposite(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum.py index ac48cc0dc4d8..1fed9a89a8be 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_default_value.py index 99d6fd5fc042..c9d2ddb32476 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumDefaultValue(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_integer.py index b771b7a61f55..b081e13fcd88 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_integer.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_integer.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumInteger(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_integer_default_value.py index 8df41b2bd320..3b4b3f98baf3 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_integer_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_enum_integer_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumIntegerDefaultValue(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_object_with_enum_property.py index b73faea2c909..e85d171a0c52 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/outer_object_with_enum_property.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.outer_enum import OuterEnum from petstore_api.models.outer_enum_integer import OuterEnumInteger -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterObjectWithEnumProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/parent.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/parent.py index 6d952bc4d557..8e19d7e32640 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/parent.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/parent.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Parent(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/parent_with_optional_dict.py index 073836419245..5eac820c0419 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/parent_with_optional_dict.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/parent_with_optional_dict.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ParentWithOptionalDict(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pet.py index ad545ecdd848..8eda9c00645e 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pet.py @@ -18,12 +18,10 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Pet(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pig.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pig.py index b3a759e89b7b..34be33810ce4 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pig.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pig.py @@ -20,8 +20,7 @@ from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pony_sizes.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pony_sizes.py index c70683def48d..3de54fc29c0f 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pony_sizes.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/pony_sizes.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.type import Type -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PonySizes(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/poop_cleaning.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/poop_cleaning.py index 3733c7bd9b00..c3804564c5ee 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/poop_cleaning.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/poop_cleaning.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PoopCleaning(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/primitive_string.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/primitive_string.py index f23b8503d855..87f40de6c848 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/primitive_string.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/primitive_string.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PrimitiveString(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/property_map.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/property_map.py index e34512b98d55..486ad4da59db 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/property_map.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/property_map.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyMap(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/property_name_collision.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/property_name_collision.py index bca5de5f58fd..8c863057996e 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/property_name_collision.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/property_name_collision.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyNameCollision(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/read_only_first.py index e22fac10b2b5..b9f371f417a7 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/read_only_first.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/read_only_first.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ReadOnlyFirst(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/second_circular_all_of_ref.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/second_circular_all_of_ref.py index d8112af7e452..f41c27b6055d 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/second_circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/second_circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondCircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/second_ref.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/second_ref.py index 69eb99fad636..3a4c16010cfb 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/second_ref.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/second_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/self_reference_model.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/self_reference_model.py index fb84a0573dba..ccefa2c304bc 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/self_reference_model.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/self_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SelfReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/single_ref_type.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/single_ref_type.py index 91ab07e2535c..7e2f76951095 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/single_ref_type.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/single_ref_type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SingleRefType(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_character_enum.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_character_enum.py index 1d85fd148d4b..f2c71ebefd03 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_character_enum.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_character_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SpecialCharacterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_model_name.py index 4188827e69e7..4e2ce035b15c 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_model_name.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_model_name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialModelName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_name.py index 432acdbdb90a..5cd2af624d85 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/special_name.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tag.py index 5dbba0015e8b..55e67da5a1a2 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tag.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tag.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tag(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tagged_union.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tagged_union.py index 2930dd983976..e437fbf51699 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tagged_union.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tagged_union.py @@ -20,8 +20,7 @@ from petstore_api.models.known import Known from petstore_api.models.other import Other from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TAGGEDUNION_ONE_OF_SCHEMAS = ["Known", "Other"] diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/task.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/task.py index e926f4c275d5..8f4bc6dee626 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/task.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/task.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List from uuid import UUID from petstore_api.models.task_activity import TaskActivity -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Task(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/task_activity.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/task_activity.py index cc1e1fc5a60f..f0541228a580 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/task_activity.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/task_activity.py @@ -21,8 +21,7 @@ from petstore_api.models.feeding import Feeding from petstore_api.models.poop_cleaning import PoopCleaning from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"] diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_enum.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_enum.py index 8eae227a84e9..b19bdb08cd26 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_enum.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_enum_with_default.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_enum_with_default.py index 9304d3ab8497..bf63e480a080 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_enum_with_default.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_enum_with_default.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnumWithDefault(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_error_responses_with_model400_response.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_error_responses_with_model400_response.py index 6f4bba183ee4..addb55fd988d 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_error_responses_with_model400_response.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_error_responses_with_model400_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel400Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_error_responses_with_model404_response.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_error_responses_with_model404_response.py index 16b242b56b71..22df2bab0a88 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_error_responses_with_model404_response.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_error_responses_with_model404_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel404Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_inline_freeform_additional_properties_request.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_inline_freeform_additional_properties_request.py index 67f893c75448..9d71d50bded5 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_inline_freeform_additional_properties_request.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_inline_freeform_additional_properties_request.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestInlineFreeformAdditionalPropertiesRequest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_model_with_enum_default.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_model_with_enum_default.py index de1fd02f0228..9fed49b5df8e 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_model_with_enum_default.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_model_with_enum_default.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.test_enum import TestEnum from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestModelWithEnumDefault(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_object_for_multipart_requests_request_marker.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_object_for_multipart_requests_request_marker.py index e1b5959f69d1..726a6468810b 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_object_for_multipart_requests_request_marker.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/test_object_for_multipart_requests_request_marker.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestObjectForMultipartRequestsRequestMarker(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tiger.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tiger.py index c1f7eebcb138..0ec4d943f4b3 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tiger.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/tiger.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tiger(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/type.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/type.py index 35a847de894f..67d39ce69af6 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/type.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class Type(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py index 100b8df77e60..ca46efe057ef 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalModelListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py index 78d19e89e0e7..555c5f98a6bd 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalStringListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/upload_file_with_additional_properties_request_object.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/upload_file_with_additional_properties_request_object.py index 02ccb0a8c689..f6509fddeaf8 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/upload_file_with_additional_properties_request_object.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/upload_file_with_additional_properties_request_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UploadFileWithAdditionalPropertiesRequestObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/user.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/user.py index 624e5c2135c4..dc6d4bff158b 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/user.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/user.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class User(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/uuid_with_pattern.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/uuid_with_pattern.py index 31c7b3567a6c..da371f9cb2a4 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/uuid_with_pattern.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/uuid_with_pattern.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, field_validator from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UuidWithPattern(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/with_nested_one_of.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/with_nested_one_of.py index c85fa5963a75..2dcc2402225b 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/with_nested_one_of.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/with_nested_one_of.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.one_of_enum_string import OneOfEnumString from petstore_api.models.pig import Pig -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class WithNestedOneOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx/pyproject.toml b/samples/openapi3/client/petstore/python-httpx/pyproject.toml index 15b2a10b849b..0e714a86db48 100644 --- a/samples/openapi3/client/petstore/python-httpx/pyproject.toml +++ b/samples/openapi3/client/petstore/python-httpx/pyproject.toml @@ -16,7 +16,6 @@ dependencies = [ "pem (>=19.3.0)", "pycryptodome (>=3.9.0)", "pydantic (>=2.11)", - "typing-extensions (>=4.7.1)", ] [project.urls] diff --git a/samples/openapi3/client/petstore/python-httpx/requirements.txt b/samples/openapi3/client/petstore/python-httpx/requirements.txt index 5aad1e2102b5..06fcf20a99e5 100644 --- a/samples/openapi3/client/petstore/python-httpx/requirements.txt +++ b/samples/openapi3/client/petstore/python-httpx/requirements.txt @@ -3,4 +3,3 @@ httpx >= 0.28.1 pem >= 19.3.0 pycryptodome >= 3.9.0 pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/samples/openapi3/client/petstore/python-httpx/setup.py b/samples/openapi3/client/petstore/python-httpx/setup.py index e3fbfe697e5a..82b09d7dd5ac 100644 --- a/samples/openapi3/client/petstore/python-httpx/setup.py +++ b/samples/openapi3/client/petstore/python-httpx/setup.py @@ -27,7 +27,6 @@ "pem >= 19.3.0", "pycryptodome >= 3.9.0", "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/another_fake_api.py index 3e70d5e8c536..aae076c9d6f5 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/another_fake_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/default_api.py index 0044d1e0287c..4c9e7f598200 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/default_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from petstore_api.models.foo_get_default_response import FooGetDefaultResponse diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/fake_api.py index 4a6f7b7183da..2d98066ca44b 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/fake_api.py @@ -13,13 +13,11 @@ import json import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import date, datetime from pydantic import Field, StrictBool, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from uuid import UUID from petstore_api.models.client import Client from petstore_api.models.enum_class import EnumClass diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/fake_classname_tags123_api.py index da4d328c100f..c3dafa3e5628 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/fake_classname_tags123_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/import_test_datetime_api.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/import_test_datetime_api.py index fd933e5180e0..ca6b2eb7b9da 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/import_test_datetime_api.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/import_test_datetime_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import datetime diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/pet_api.py index d304e3fba145..0a2805f52295 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/pet_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, List, Optional, Tuple, Union from petstore_api.models.model_api_response import ModelApiResponse from petstore_api.models.pet import Pet diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/store_api.py index b6c56870658d..636118e714cd 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/store_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictInt, StrictStr -from typing import Dict -from typing_extensions import Annotated +from typing import Annotated, Dict from petstore_api.models.order import Order from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/user_api.py index d07e94b739fe..6d2d24a93ec6 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/api/user_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictStr -from typing import List -from typing_extensions import Annotated +from typing import Annotated, List from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/configuration.py index cefa6fa3a1f9..26bacd087c51 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/configuration.py @@ -16,8 +16,7 @@ import logging from logging import FileHandler import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union -from typing_extensions import NotRequired, Self +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union from petstore_api.signing import HttpSigningConfiguration diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/exceptions.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/exceptions.py index 8e7fcf82d538..d978c12f2b67 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/exceptions.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/exceptions.py @@ -10,8 +10,7 @@ """ # noqa: E501 -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_any_type.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_any_type.py index 19db20137bc4..195345309ff3 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_any_type.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_any_type.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesAnyType(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_class.py index c305a68c725f..5f9d21f2697d 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.pet import Pet -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_object.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_object.py index d23fd87e51f3..41c2b4aea078 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_object.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_with_description_only.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_with_description_only.py index b1f42400b676..197648ee0a36 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_with_description_only.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/additional_properties_with_description_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesWithDescriptionOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/all_of_super_model.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/all_of_super_model.py index 4793b8e4b3cd..b8dcac0f1e64 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/all_of_super_model.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/all_of_super_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfSuperModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/all_of_with_single_ref.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/all_of_with_single_ref.py index 34e4c3dca7ea..07f66ebe8325 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/all_of_with_single_ref.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/all_of_with_single_ref.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.single_ref_type import SingleRefType -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfWithSingleRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/animal.py index 7337a96aa42c..7e54b4d6fd45 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/animal.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/animal.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/any_of_color.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/any_of_color.py index f6d277e79498..4bcb6a751c30 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/any_of_color.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/any_of_color.py @@ -18,10 +18,8 @@ import pprint import re # noqa: F401 from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import List, Optional -from typing_extensions import Annotated -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Annotated, List, Optional +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/any_of_pig.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/any_of_pig.py index c949e136f415..ba66686bc9c8 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/any_of_pig.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/any_of_pig.py @@ -21,8 +21,7 @@ from typing import Optional from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_array_of_model.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_array_of_model.py index 896229b2570a..213bc1d38660 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_array_of_number_only.py index 3fb0fb5056f6..d39c0be8858d 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_map_model.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_map_model.py index 8e03d5766e33..568f99edfcba 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_map_model.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_map_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfMapModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_number_only.py index 12b045326e11..f1803a5f12b4 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_test.py index bb80aa6ab77d..f28889ed5fcf 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_test.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/array_test.py @@ -18,11 +18,9 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.read_only_first import ReadOnlyFirst -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/base_discriminator.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/base_discriminator.py index 955dd21246d4..f313f3477ce6 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/base_discriminator.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/base_discriminator.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/basque_pig.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/basque_pig.py index b279e5a53e14..58f4a8eeac7e 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/basque_pig.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/basque_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class BasquePig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/bathing.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/bathing.py index 46b35c700e2b..a1d5a741d26b 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/bathing.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/bathing.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Bathing(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/capitalization.py index f4af4f06f207..6996d6a337e7 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/capitalization.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/capitalization.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Capitalization(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/cat.py index 8692ceebb9a6..23269ba1d6c4 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/cat.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/cat.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictBool from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Cat(Animal): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/category.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/category.py index f7d60fe80c03..67f22394fda5 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/category.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/category.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Category(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/circular_all_of_ref.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/circular_all_of_ref.py index 69d6cfd2bdf4..749f48312086 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/circular_reference_model.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/circular_reference_model.py index f43b0863da44..61efdad97c65 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/circular_reference_model.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/circular_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/class_model.py index 331958d9b209..6903989abf92 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/class_model.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/class_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ClassModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/client.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/client.py index cdbddee56d31..148f480265fe 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/client.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/client.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Client(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/color.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/color.py index bb740fb597d4..6d69a03f9b2e 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/color.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/color.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/creature.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/creature.py index 29cfc5e5f56c..776dfb8d7d8b 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/creature.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/creature.py @@ -21,8 +21,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Union from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/creature_info.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/creature_info.py index 2488eca5d562..ba753358b553 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/creature_info.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/creature_info.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CreatureInfo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/danish_pig.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/danish_pig.py index ad3e5496cbd1..26200765c775 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/danish_pig.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/danish_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DanishPig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/data_output_format.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/data_output_format.py index ee3df76c5169..af7b5d212fc2 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/data_output_format.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/data_output_format.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class DataOutputFormat(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/deprecated_object.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/deprecated_object.py index 0c09f54f0e91..1c1190b7d9f1 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/deprecated_object.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/deprecated_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DeprecatedObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/discriminator_all_of_sub.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/discriminator_all_of_sub.py index f5a0aa665e7f..ab29addbb172 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/discriminator_all_of_sub.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/discriminator_all_of_sub.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DiscriminatorAllOfSub(DiscriminatorAllOfSuper): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/discriminator_all_of_super.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/discriminator_all_of_super.py index 275312d713ad..74faf8314dba 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/discriminator_all_of_super.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/discriminator_all_of_super.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/dog.py index b8752a1f948f..4fe37d2b44c1 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/dog.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/dog.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Dog(Animal): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/dummy_model.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/dummy_model.py index 19a8109a056d..8ccb3d483c0d 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/dummy_model.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/dummy_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DummyModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_arrays.py index d841ea10e5b8..c56e880111b0 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_arrays.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_class.py index 1ba5af8036df..8d4effa9573a 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_class.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_class.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumClass(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_number_vendor_ext.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_number_vendor_ext.py index 5588de5c7043..a7e98fb3b521 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_number_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_number_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumNumberVendorExt(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_ref_with_default_value.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_ref_with_default_value.py index 5c29c04aa7f2..e4a77e52206d 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_ref_with_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_ref_with_default_value.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.data_output_format import DataOutputFormat -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumRefWithDefaultValue(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string1.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string1.py index 678b4e12661f..e14b8e930b6a 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string1.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string1.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString1(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string2.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string2.py index a959f554e0af..9f8f6c0fc0eb 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string2.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string2.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString2(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string_vendor_ext.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string_vendor_ext.py index 821812e9b088..a94b2a9afa35 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_string_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumStringVendorExt(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_test.py index 604194529754..c5674e26b58b 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/enum_test.py @@ -25,8 +25,7 @@ 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 typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/feeding.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/feeding.py index ce5a36f49afb..d1ca63749b8a 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/feeding.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/feeding.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Feeding(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/file.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/file.py index 7d8d010f8c82..7ed84d23410b 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/file.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/file.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class File(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/file_schema_test_class.py index 5e8ca6861d83..5c9924850f5c 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/file_schema_test_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FileSchemaTestClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/first_ref.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/first_ref.py index 5c03477f15f0..8dd448e7c018 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/first_ref.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/first_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FirstRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/foo.py index 65a289e187de..108169a3f140 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/foo.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/foo.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Foo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/foo_get_default_response.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/foo_get_default_response.py index e3a3f7a66aed..b0d11fa1976a 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/foo_get_default_response.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/foo_get_default_response.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.foo import Foo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FooGetDefaultResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/format_test.py index 92f3cacf7f91..2bc43ade9948 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/format_test.py @@ -20,11 +20,9 @@ from datetime import date, datetime from decimal import Decimal from pydantic import BaseModel, ConfigDict, Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional, Tuple, Union from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FormatTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/has_only_read_only.py index c7a1c9f0913e..ec8ece81be5e 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/has_only_read_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HasOnlyReadOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/header_arg.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/header_arg.py index bd8d1b0090ed..553fe8105251 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/header_arg.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/header_arg.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HeaderArg(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/health_check_result.py index 270725757bad..df0360f75353 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/health_check_result.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HealthCheckResult(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/hunting_dog.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/hunting_dog.py index 4064ce67183c..43a54e233de3 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/hunting_dog.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/hunting_dog.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature import Creature from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HuntingDog(Creature): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/info.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/info.py index 0f57b71af2aa..040b9ea8c185 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/info.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/info.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Info(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/inner_dict_with_property.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/inner_dict_with_property.py index 9b709fb15e43..67abdb430ff1 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/inner_dict_with_property.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/inner_dict_with_property.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InnerDictWithProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/input_all_of.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/input_all_of.py index e03dd4fc3839..61bc42bb9ae2 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/input_all_of.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/input_all_of.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InputAllOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/int_or_string.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/int_or_string.py index f2a5a0a2d4a3..4343951a010d 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/int_or_string.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/int_or_string.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/known.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/known.py index daf64e57b96d..6508435d7c0d 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/known.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/known.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Known(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/list_class.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/list_class.py index 634b8d012d29..f4217e29aa95 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/list_class.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/list_class.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ListClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/map_of_array_of_model.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/map_of_array_of_model.py index e22e38fe0b59..e57d8166ea4e 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/map_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/map_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/map_test.py index ac4080efbc88..c54debde848c 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/map_test.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/mixed_properties_and_additional_properties_class.py index 20091d09ce86..51081afdaad5 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -22,8 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model200_response.py index 63c9faad21f5..eaeccd5fc6d7 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model200_response.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model200_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Model200Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_api_response.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_api_response.py index 517441e5d545..e81f467aeb7a 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_api_response.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_api_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelApiResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_field.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_field.py index 80951622bed4..648b750801e5 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_field.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_field.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelField(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_return.py index 374b0b454781..6637cfd373cd 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_return.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/model_return.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelReturn(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/multi_arrays.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/multi_arrays.py index 00d62ef2df3e..2aa3a0d03398 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/multi_arrays.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/multi_arrays.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MultiArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/name.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/name.py index 9b4f7a436ed6..53ec70e661b6 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/name.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Name(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/nullable_class.py index 25c6ba3d4d39..ff2f4c651c33 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/nullable_class.py @@ -20,8 +20,7 @@ from datetime import date, datetime from pydantic import BaseModel, ConfigDict, StrictBool, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/nullable_property.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/nullable_property.py index 819cc52809b9..95373a2be755 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/nullable_property.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/nullable_property.py @@ -18,10 +18,8 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated -from typing import Optional, Set -from typing_extensions import Self +from typing import Annotated, Any, ClassVar, Dict, List, Optional +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/number_only.py index b91b8d045003..41accc1a9d40 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/number_only.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/object_to_test_additional_properties.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/object_to_test_additional_properties.py index 2ac8a9d37a2c..1e2ea9923997 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/object_to_test_additional_properties.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/object_to_test_additional_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectToTestAdditionalProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/object_with_deprecated_fields.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/object_with_deprecated_fields.py index e3bae640cdb7..cc2fa540829a 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/object_with_deprecated_fields.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/object_with_deprecated_fields.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.deprecated_object import DeprecatedObject -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectWithDeprecatedFields(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/one_of_enum_string.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/one_of_enum_string.py index 53101c37cc8b..6d218d95f0ee 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/one_of_enum_string.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/one_of_enum_string.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OneOfEnumString(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/order.py index 0cd26ab72b34..4d6119c41528 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/order.py @@ -20,8 +20,7 @@ from datetime import datetime from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Order(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/other.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/other.py index 2f8d6ca1a282..ecb546af522d 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/other.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/other.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Other(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_composite.py index 05186f8015e6..e557a82b88ed 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_composite.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_composite.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterComposite(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum.py index ac48cc0dc4d8..1fed9a89a8be 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_default_value.py index 99d6fd5fc042..c9d2ddb32476 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumDefaultValue(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_integer.py index b771b7a61f55..b081e13fcd88 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_integer.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_integer.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumInteger(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_integer_default_value.py index 8df41b2bd320..3b4b3f98baf3 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_integer_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_enum_integer_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumIntegerDefaultValue(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_object_with_enum_property.py index b73faea2c909..e85d171a0c52 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/outer_object_with_enum_property.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.outer_enum import OuterEnum from petstore_api.models.outer_enum_integer import OuterEnumInteger -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterObjectWithEnumProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/parent.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/parent.py index 6d952bc4d557..8e19d7e32640 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/parent.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/parent.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Parent(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/parent_with_optional_dict.py index 073836419245..5eac820c0419 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/parent_with_optional_dict.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/parent_with_optional_dict.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ParentWithOptionalDict(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pet.py index ad545ecdd848..8eda9c00645e 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pet.py @@ -18,12 +18,10 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Pet(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pig.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pig.py index b3a759e89b7b..34be33810ce4 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pig.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pig.py @@ -20,8 +20,7 @@ from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pony_sizes.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pony_sizes.py index c70683def48d..3de54fc29c0f 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pony_sizes.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/pony_sizes.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.type import Type -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PonySizes(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/poop_cleaning.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/poop_cleaning.py index 3733c7bd9b00..c3804564c5ee 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/poop_cleaning.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/poop_cleaning.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PoopCleaning(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/primitive_string.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/primitive_string.py index f23b8503d855..87f40de6c848 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/primitive_string.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/primitive_string.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PrimitiveString(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/property_map.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/property_map.py index e34512b98d55..486ad4da59db 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/property_map.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/property_map.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyMap(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/property_name_collision.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/property_name_collision.py index bca5de5f58fd..8c863057996e 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/property_name_collision.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/property_name_collision.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyNameCollision(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/read_only_first.py index e22fac10b2b5..b9f371f417a7 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/read_only_first.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/read_only_first.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ReadOnlyFirst(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/second_circular_all_of_ref.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/second_circular_all_of_ref.py index d8112af7e452..f41c27b6055d 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/second_circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/second_circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondCircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/second_ref.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/second_ref.py index 69eb99fad636..3a4c16010cfb 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/second_ref.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/second_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/self_reference_model.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/self_reference_model.py index fb84a0573dba..ccefa2c304bc 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/self_reference_model.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/self_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SelfReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/single_ref_type.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/single_ref_type.py index 91ab07e2535c..7e2f76951095 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/single_ref_type.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/single_ref_type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SingleRefType(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_character_enum.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_character_enum.py index 1d85fd148d4b..f2c71ebefd03 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_character_enum.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_character_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SpecialCharacterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_model_name.py index 4188827e69e7..4e2ce035b15c 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_model_name.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_model_name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialModelName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_name.py index 432acdbdb90a..5cd2af624d85 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/special_name.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tag.py index 5dbba0015e8b..55e67da5a1a2 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tag.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tag.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tag(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tagged_union.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tagged_union.py index 2930dd983976..e437fbf51699 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tagged_union.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tagged_union.py @@ -20,8 +20,7 @@ from petstore_api.models.known import Known from petstore_api.models.other import Other from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TAGGEDUNION_ONE_OF_SCHEMAS = ["Known", "Other"] diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/task.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/task.py index e926f4c275d5..8f4bc6dee626 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/task.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/task.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List from uuid import UUID from petstore_api.models.task_activity import TaskActivity -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Task(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/task_activity.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/task_activity.py index cc1e1fc5a60f..f0541228a580 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/task_activity.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/task_activity.py @@ -21,8 +21,7 @@ from petstore_api.models.feeding import Feeding from petstore_api.models.poop_cleaning import PoopCleaning from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"] diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_enum.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_enum.py index 8eae227a84e9..b19bdb08cd26 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_enum.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_enum_with_default.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_enum_with_default.py index 9304d3ab8497..bf63e480a080 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_enum_with_default.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_enum_with_default.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnumWithDefault(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_error_responses_with_model400_response.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_error_responses_with_model400_response.py index 6f4bba183ee4..addb55fd988d 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_error_responses_with_model400_response.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_error_responses_with_model400_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel400Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_error_responses_with_model404_response.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_error_responses_with_model404_response.py index 16b242b56b71..22df2bab0a88 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_error_responses_with_model404_response.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_error_responses_with_model404_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel404Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_inline_freeform_additional_properties_request.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_inline_freeform_additional_properties_request.py index 67f893c75448..9d71d50bded5 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_inline_freeform_additional_properties_request.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_inline_freeform_additional_properties_request.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestInlineFreeformAdditionalPropertiesRequest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_model_with_enum_default.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_model_with_enum_default.py index de1fd02f0228..9fed49b5df8e 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_model_with_enum_default.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_model_with_enum_default.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.test_enum import TestEnum from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestModelWithEnumDefault(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_object_for_multipart_requests_request_marker.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_object_for_multipart_requests_request_marker.py index e1b5959f69d1..726a6468810b 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_object_for_multipart_requests_request_marker.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/test_object_for_multipart_requests_request_marker.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestObjectForMultipartRequestsRequestMarker(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tiger.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tiger.py index c1f7eebcb138..0ec4d943f4b3 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tiger.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/tiger.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tiger(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/type.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/type.py index 35a847de894f..67d39ce69af6 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/type.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class Type(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py index 100b8df77e60..ca46efe057ef 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalModelListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py index 78d19e89e0e7..555c5f98a6bd 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalStringListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/upload_file_with_additional_properties_request_object.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/upload_file_with_additional_properties_request_object.py index 02ccb0a8c689..f6509fddeaf8 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/upload_file_with_additional_properties_request_object.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/upload_file_with_additional_properties_request_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UploadFileWithAdditionalPropertiesRequestObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/user.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/user.py index 624e5c2135c4..dc6d4bff158b 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/user.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/user.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class User(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/uuid_with_pattern.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/uuid_with_pattern.py index 31c7b3567a6c..da371f9cb2a4 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/uuid_with_pattern.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/uuid_with_pattern.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, field_validator from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UuidWithPattern(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/with_nested_one_of.py b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/with_nested_one_of.py index c85fa5963a75..2dcc2402225b 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/with_nested_one_of.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/petstore_api/models/with_nested_one_of.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.one_of_enum_string import OneOfEnumString from petstore_api.models.pig import Pig -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class WithNestedOneOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/pyproject.toml b/samples/openapi3/client/petstore/python-httpx2-sync/pyproject.toml index d0c97fcd113f..5b5e39678c0f 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/pyproject.toml +++ b/samples/openapi3/client/petstore/python-httpx2-sync/pyproject.toml @@ -16,7 +16,6 @@ dependencies = [ "pem (>=19.3.0)", "pycryptodome (>=3.9.0)", "pydantic (>=2.11)", - "typing-extensions (>=4.7.1)", ] [project.urls] diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/requirements.txt b/samples/openapi3/client/petstore/python-httpx2-sync/requirements.txt index ccf3d0aa899d..01be284f8452 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/requirements.txt +++ b/samples/openapi3/client/petstore/python-httpx2-sync/requirements.txt @@ -3,4 +3,3 @@ httpx2 >= 2.13.0, < 3 pem >= 19.3.0 pycryptodome >= 3.9.0 pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/samples/openapi3/client/petstore/python-httpx2-sync/setup.py b/samples/openapi3/client/petstore/python-httpx2-sync/setup.py index def9367fbbd0..f90b73974e23 100644 --- a/samples/openapi3/client/petstore/python-httpx2-sync/setup.py +++ b/samples/openapi3/client/petstore/python-httpx2-sync/setup.py @@ -27,7 +27,6 @@ "pem >= 19.3.0", "pycryptodome >= 3.9.0", "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/another_fake_api.py index 968ac5d448d0..2d3eaa77b18a 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/another_fake_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/default_api.py index 5a766861f81f..62a1772a2875 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/default_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from petstore_api.models.foo_get_default_response import FooGetDefaultResponse diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/fake_api.py index 8c7dc59ccaac..1880c7af2ba6 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/fake_api.py @@ -13,13 +13,11 @@ import json import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import date, datetime from pydantic import Field, StrictBool, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from uuid import UUID from petstore_api.models.client import Client from petstore_api.models.enum_class import EnumClass diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/fake_classname_tags123_api.py index 9e6aeb9ed9c9..1366e692e407 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/fake_classname_tags123_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/import_test_datetime_api.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/import_test_datetime_api.py index 9dbb9cd39e69..4c8a6d678cd5 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/import_test_datetime_api.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/import_test_datetime_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import datetime diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/pet_api.py index 92b61d5dcbad..03ac8468c6d5 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/pet_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, List, Optional, Tuple, Union from petstore_api.models.model_api_response import ModelApiResponse from petstore_api.models.pet import Pet diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/store_api.py index 5b7543c1b285..9d7f4ed62c59 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/store_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictInt, StrictStr -from typing import Dict -from typing_extensions import Annotated +from typing import Annotated, Dict from petstore_api.models.order import Order from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/user_api.py index 387ff3f12e8d..c7b5228e0d2e 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/api/user_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictStr -from typing import List -from typing_extensions import Annotated +from typing import Annotated, List from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/configuration.py index cefa6fa3a1f9..26bacd087c51 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/configuration.py @@ -16,8 +16,7 @@ import logging from logging import FileHandler import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union -from typing_extensions import NotRequired, Self +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union from petstore_api.signing import HttpSigningConfiguration diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/exceptions.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/exceptions.py index 8e7fcf82d538..d978c12f2b67 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/exceptions.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/exceptions.py @@ -10,8 +10,7 @@ """ # noqa: E501 -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_any_type.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_any_type.py index 19db20137bc4..195345309ff3 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_any_type.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_any_type.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesAnyType(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_class.py index c305a68c725f..5f9d21f2697d 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.pet import Pet -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_object.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_object.py index d23fd87e51f3..41c2b4aea078 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_object.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_with_description_only.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_with_description_only.py index b1f42400b676..197648ee0a36 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_with_description_only.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/additional_properties_with_description_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesWithDescriptionOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/all_of_super_model.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/all_of_super_model.py index 4793b8e4b3cd..b8dcac0f1e64 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/all_of_super_model.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/all_of_super_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfSuperModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/all_of_with_single_ref.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/all_of_with_single_ref.py index 34e4c3dca7ea..07f66ebe8325 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/all_of_with_single_ref.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/all_of_with_single_ref.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.single_ref_type import SingleRefType -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfWithSingleRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/animal.py index 7337a96aa42c..7e54b4d6fd45 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/animal.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/animal.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/any_of_color.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/any_of_color.py index f6d277e79498..4bcb6a751c30 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/any_of_color.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/any_of_color.py @@ -18,10 +18,8 @@ import pprint import re # noqa: F401 from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import List, Optional -from typing_extensions import Annotated -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Annotated, List, Optional +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/any_of_pig.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/any_of_pig.py index c949e136f415..ba66686bc9c8 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/any_of_pig.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/any_of_pig.py @@ -21,8 +21,7 @@ from typing import Optional from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_array_of_model.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_array_of_model.py index 896229b2570a..213bc1d38660 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_array_of_number_only.py index 3fb0fb5056f6..d39c0be8858d 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_map_model.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_map_model.py index 8e03d5766e33..568f99edfcba 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_map_model.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_map_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfMapModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_number_only.py index 12b045326e11..f1803a5f12b4 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_test.py index bb80aa6ab77d..f28889ed5fcf 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_test.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/array_test.py @@ -18,11 +18,9 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.read_only_first import ReadOnlyFirst -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/base_discriminator.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/base_discriminator.py index 955dd21246d4..f313f3477ce6 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/base_discriminator.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/base_discriminator.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/basque_pig.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/basque_pig.py index b279e5a53e14..58f4a8eeac7e 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/basque_pig.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/basque_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class BasquePig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/bathing.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/bathing.py index 46b35c700e2b..a1d5a741d26b 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/bathing.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/bathing.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Bathing(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/capitalization.py index f4af4f06f207..6996d6a337e7 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/capitalization.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/capitalization.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Capitalization(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/cat.py index 8692ceebb9a6..23269ba1d6c4 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/cat.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/cat.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictBool from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Cat(Animal): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/category.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/category.py index f7d60fe80c03..67f22394fda5 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/category.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/category.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Category(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/circular_all_of_ref.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/circular_all_of_ref.py index 69d6cfd2bdf4..749f48312086 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/circular_reference_model.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/circular_reference_model.py index f43b0863da44..61efdad97c65 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/circular_reference_model.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/circular_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/class_model.py index 331958d9b209..6903989abf92 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/class_model.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/class_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ClassModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/client.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/client.py index cdbddee56d31..148f480265fe 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/client.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/client.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Client(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/color.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/color.py index bb740fb597d4..6d69a03f9b2e 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/color.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/color.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/creature.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/creature.py index 29cfc5e5f56c..776dfb8d7d8b 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/creature.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/creature.py @@ -21,8 +21,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Union from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/creature_info.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/creature_info.py index 2488eca5d562..ba753358b553 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/creature_info.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/creature_info.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CreatureInfo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/danish_pig.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/danish_pig.py index ad3e5496cbd1..26200765c775 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/danish_pig.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/danish_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DanishPig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/data_output_format.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/data_output_format.py index ee3df76c5169..af7b5d212fc2 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/data_output_format.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/data_output_format.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class DataOutputFormat(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/deprecated_object.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/deprecated_object.py index 0c09f54f0e91..1c1190b7d9f1 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/deprecated_object.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/deprecated_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DeprecatedObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/discriminator_all_of_sub.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/discriminator_all_of_sub.py index f5a0aa665e7f..ab29addbb172 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/discriminator_all_of_sub.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/discriminator_all_of_sub.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DiscriminatorAllOfSub(DiscriminatorAllOfSuper): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/discriminator_all_of_super.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/discriminator_all_of_super.py index 275312d713ad..74faf8314dba 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/discriminator_all_of_super.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/discriminator_all_of_super.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/dog.py index b8752a1f948f..4fe37d2b44c1 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/dog.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/dog.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Dog(Animal): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/dummy_model.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/dummy_model.py index 19a8109a056d..8ccb3d483c0d 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/dummy_model.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/dummy_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DummyModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_arrays.py index d841ea10e5b8..c56e880111b0 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_arrays.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_class.py index 1ba5af8036df..8d4effa9573a 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_class.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_class.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumClass(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_number_vendor_ext.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_number_vendor_ext.py index 5588de5c7043..a7e98fb3b521 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_number_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_number_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumNumberVendorExt(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_ref_with_default_value.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_ref_with_default_value.py index 5c29c04aa7f2..e4a77e52206d 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_ref_with_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_ref_with_default_value.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.data_output_format import DataOutputFormat -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumRefWithDefaultValue(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string1.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string1.py index 678b4e12661f..e14b8e930b6a 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string1.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string1.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString1(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string2.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string2.py index a959f554e0af..9f8f6c0fc0eb 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string2.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string2.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString2(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string_vendor_ext.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string_vendor_ext.py index 821812e9b088..a94b2a9afa35 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_string_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumStringVendorExt(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_test.py index 604194529754..c5674e26b58b 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/enum_test.py @@ -25,8 +25,7 @@ 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 typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/feeding.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/feeding.py index ce5a36f49afb..d1ca63749b8a 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/feeding.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/feeding.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Feeding(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/file.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/file.py index 7d8d010f8c82..7ed84d23410b 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/file.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/file.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class File(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/file_schema_test_class.py index 5e8ca6861d83..5c9924850f5c 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/file_schema_test_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FileSchemaTestClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/first_ref.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/first_ref.py index 5c03477f15f0..8dd448e7c018 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/first_ref.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/first_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FirstRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/foo.py index 65a289e187de..108169a3f140 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/foo.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/foo.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Foo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/foo_get_default_response.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/foo_get_default_response.py index e3a3f7a66aed..b0d11fa1976a 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/foo_get_default_response.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/foo_get_default_response.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.foo import Foo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FooGetDefaultResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/format_test.py index 92f3cacf7f91..2bc43ade9948 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/format_test.py @@ -20,11 +20,9 @@ from datetime import date, datetime from decimal import Decimal from pydantic import BaseModel, ConfigDict, Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional, Tuple, Union from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FormatTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/has_only_read_only.py index c7a1c9f0913e..ec8ece81be5e 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/has_only_read_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HasOnlyReadOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/header_arg.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/header_arg.py index bd8d1b0090ed..553fe8105251 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/header_arg.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/header_arg.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HeaderArg(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/health_check_result.py index 270725757bad..df0360f75353 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/health_check_result.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HealthCheckResult(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/hunting_dog.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/hunting_dog.py index 4064ce67183c..43a54e233de3 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/hunting_dog.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/hunting_dog.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature import Creature from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HuntingDog(Creature): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/info.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/info.py index 0f57b71af2aa..040b9ea8c185 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/info.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/info.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Info(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/inner_dict_with_property.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/inner_dict_with_property.py index 9b709fb15e43..67abdb430ff1 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/inner_dict_with_property.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/inner_dict_with_property.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InnerDictWithProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/input_all_of.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/input_all_of.py index e03dd4fc3839..61bc42bb9ae2 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/input_all_of.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/input_all_of.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InputAllOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/int_or_string.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/int_or_string.py index f2a5a0a2d4a3..4343951a010d 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/int_or_string.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/int_or_string.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"] diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/known.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/known.py index daf64e57b96d..6508435d7c0d 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/known.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/known.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Known(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/list_class.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/list_class.py index 634b8d012d29..f4217e29aa95 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/list_class.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/list_class.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ListClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/map_of_array_of_model.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/map_of_array_of_model.py index e22e38fe0b59..e57d8166ea4e 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/map_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/map_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/map_test.py index ac4080efbc88..c54debde848c 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/map_test.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/mixed_properties_and_additional_properties_class.py index 20091d09ce86..51081afdaad5 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -22,8 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model200_response.py index 63c9faad21f5..eaeccd5fc6d7 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model200_response.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model200_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Model200Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_api_response.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_api_response.py index 517441e5d545..e81f467aeb7a 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_api_response.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_api_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelApiResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_field.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_field.py index 80951622bed4..648b750801e5 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_field.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_field.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelField(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_return.py index 374b0b454781..6637cfd373cd 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_return.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/model_return.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelReturn(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/multi_arrays.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/multi_arrays.py index 00d62ef2df3e..2aa3a0d03398 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/multi_arrays.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/multi_arrays.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MultiArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/name.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/name.py index 9b4f7a436ed6..53ec70e661b6 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/name.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Name(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/nullable_class.py index 25c6ba3d4d39..ff2f4c651c33 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/nullable_class.py @@ -20,8 +20,7 @@ from datetime import date, datetime from pydantic import BaseModel, ConfigDict, StrictBool, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/nullable_property.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/nullable_property.py index 819cc52809b9..95373a2be755 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/nullable_property.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/nullable_property.py @@ -18,10 +18,8 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated -from typing import Optional, Set -from typing_extensions import Self +from typing import Annotated, Any, ClassVar, Dict, List, Optional +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/number_only.py index b91b8d045003..41accc1a9d40 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/number_only.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/object_to_test_additional_properties.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/object_to_test_additional_properties.py index 2ac8a9d37a2c..1e2ea9923997 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/object_to_test_additional_properties.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/object_to_test_additional_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectToTestAdditionalProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/object_with_deprecated_fields.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/object_with_deprecated_fields.py index e3bae640cdb7..cc2fa540829a 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/object_with_deprecated_fields.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/object_with_deprecated_fields.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.deprecated_object import DeprecatedObject -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectWithDeprecatedFields(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/one_of_enum_string.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/one_of_enum_string.py index 53101c37cc8b..6d218d95f0ee 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/one_of_enum_string.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/one_of_enum_string.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OneOfEnumString(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/order.py index 0cd26ab72b34..4d6119c41528 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/order.py @@ -20,8 +20,7 @@ from datetime import datetime from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Order(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/other.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/other.py index 2f8d6ca1a282..ecb546af522d 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/other.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/other.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Other(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_composite.py index 05186f8015e6..e557a82b88ed 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_composite.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_composite.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterComposite(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum.py index ac48cc0dc4d8..1fed9a89a8be 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_default_value.py index 99d6fd5fc042..c9d2ddb32476 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumDefaultValue(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_integer.py index b771b7a61f55..b081e13fcd88 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_integer.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_integer.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumInteger(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_integer_default_value.py index 8df41b2bd320..3b4b3f98baf3 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_integer_default_value.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_enum_integer_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumIntegerDefaultValue(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_object_with_enum_property.py index b73faea2c909..e85d171a0c52 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/outer_object_with_enum_property.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.outer_enum import OuterEnum from petstore_api.models.outer_enum_integer import OuterEnumInteger -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterObjectWithEnumProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/parent.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/parent.py index 6d952bc4d557..8e19d7e32640 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/parent.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/parent.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Parent(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/parent_with_optional_dict.py index 073836419245..5eac820c0419 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/parent_with_optional_dict.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/parent_with_optional_dict.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ParentWithOptionalDict(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pet.py index ad545ecdd848..8eda9c00645e 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pet.py @@ -18,12 +18,10 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Pet(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pig.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pig.py index b3a759e89b7b..34be33810ce4 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pig.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pig.py @@ -20,8 +20,7 @@ from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pony_sizes.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pony_sizes.py index c70683def48d..3de54fc29c0f 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pony_sizes.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/pony_sizes.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.type import Type -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PonySizes(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/poop_cleaning.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/poop_cleaning.py index 3733c7bd9b00..c3804564c5ee 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/poop_cleaning.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/poop_cleaning.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PoopCleaning(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/primitive_string.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/primitive_string.py index f23b8503d855..87f40de6c848 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/primitive_string.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/primitive_string.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PrimitiveString(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/property_map.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/property_map.py index e34512b98d55..486ad4da59db 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/property_map.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/property_map.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyMap(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/property_name_collision.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/property_name_collision.py index bca5de5f58fd..8c863057996e 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/property_name_collision.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/property_name_collision.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyNameCollision(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/read_only_first.py index e22fac10b2b5..b9f371f417a7 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/read_only_first.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/read_only_first.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ReadOnlyFirst(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/second_circular_all_of_ref.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/second_circular_all_of_ref.py index d8112af7e452..f41c27b6055d 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/second_circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/second_circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondCircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/second_ref.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/second_ref.py index 69eb99fad636..3a4c16010cfb 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/second_ref.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/second_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/self_reference_model.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/self_reference_model.py index fb84a0573dba..ccefa2c304bc 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/self_reference_model.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/self_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SelfReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/single_ref_type.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/single_ref_type.py index 91ab07e2535c..7e2f76951095 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/single_ref_type.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/single_ref_type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SingleRefType(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_character_enum.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_character_enum.py index 1d85fd148d4b..f2c71ebefd03 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_character_enum.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_character_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SpecialCharacterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_model_name.py index 4188827e69e7..4e2ce035b15c 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_model_name.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_model_name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialModelName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_name.py index 432acdbdb90a..5cd2af624d85 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/special_name.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tag.py index 5dbba0015e8b..55e67da5a1a2 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tag.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tag.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tag(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tagged_union.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tagged_union.py index 2930dd983976..e437fbf51699 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tagged_union.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tagged_union.py @@ -20,8 +20,7 @@ from petstore_api.models.known import Known from petstore_api.models.other import Other from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TAGGEDUNION_ONE_OF_SCHEMAS = ["Known", "Other"] diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/task.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/task.py index e926f4c275d5..8f4bc6dee626 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/task.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/task.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List from uuid import UUID from petstore_api.models.task_activity import TaskActivity -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Task(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/task_activity.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/task_activity.py index cc1e1fc5a60f..f0541228a580 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/task_activity.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/task_activity.py @@ -21,8 +21,7 @@ from petstore_api.models.feeding import Feeding from petstore_api.models.poop_cleaning import PoopCleaning from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"] diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_enum.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_enum.py index 8eae227a84e9..b19bdb08cd26 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_enum.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_enum_with_default.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_enum_with_default.py index 9304d3ab8497..bf63e480a080 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_enum_with_default.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_enum_with_default.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnumWithDefault(str, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_error_responses_with_model400_response.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_error_responses_with_model400_response.py index 6f4bba183ee4..addb55fd988d 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_error_responses_with_model400_response.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_error_responses_with_model400_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel400Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_error_responses_with_model404_response.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_error_responses_with_model404_response.py index 16b242b56b71..22df2bab0a88 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_error_responses_with_model404_response.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_error_responses_with_model404_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel404Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_inline_freeform_additional_properties_request.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_inline_freeform_additional_properties_request.py index 67f893c75448..9d71d50bded5 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_inline_freeform_additional_properties_request.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_inline_freeform_additional_properties_request.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestInlineFreeformAdditionalPropertiesRequest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_model_with_enum_default.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_model_with_enum_default.py index de1fd02f0228..9fed49b5df8e 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_model_with_enum_default.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_model_with_enum_default.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.test_enum import TestEnum from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestModelWithEnumDefault(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_object_for_multipart_requests_request_marker.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_object_for_multipart_requests_request_marker.py index e1b5959f69d1..726a6468810b 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_object_for_multipart_requests_request_marker.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/test_object_for_multipart_requests_request_marker.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestObjectForMultipartRequestsRequestMarker(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tiger.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tiger.py index c1f7eebcb138..0ec4d943f4b3 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tiger.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/tiger.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tiger(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/type.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/type.py index 35a847de894f..67d39ce69af6 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/type.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class Type(int, Enum): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py index 100b8df77e60..ca46efe057ef 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalModelListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py index 78d19e89e0e7..555c5f98a6bd 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalStringListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/upload_file_with_additional_properties_request_object.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/upload_file_with_additional_properties_request_object.py index 02ccb0a8c689..f6509fddeaf8 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/upload_file_with_additional_properties_request_object.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/upload_file_with_additional_properties_request_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UploadFileWithAdditionalPropertiesRequestObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/user.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/user.py index 624e5c2135c4..dc6d4bff158b 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/user.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/user.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class User(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/uuid_with_pattern.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/uuid_with_pattern.py index 31c7b3567a6c..da371f9cb2a4 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/uuid_with_pattern.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/uuid_with_pattern.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, field_validator from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UuidWithPattern(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/with_nested_one_of.py b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/with_nested_one_of.py index c85fa5963a75..2dcc2402225b 100644 --- a/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/with_nested_one_of.py +++ b/samples/openapi3/client/petstore/python-httpx2/petstore_api/models/with_nested_one_of.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.one_of_enum_string import OneOfEnumString from petstore_api.models.pig import Pig -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class WithNestedOneOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-httpx2/pyproject.toml b/samples/openapi3/client/petstore/python-httpx2/pyproject.toml index d0c97fcd113f..5b5e39678c0f 100644 --- a/samples/openapi3/client/petstore/python-httpx2/pyproject.toml +++ b/samples/openapi3/client/petstore/python-httpx2/pyproject.toml @@ -16,7 +16,6 @@ dependencies = [ "pem (>=19.3.0)", "pycryptodome (>=3.9.0)", "pydantic (>=2.11)", - "typing-extensions (>=4.7.1)", ] [project.urls] diff --git a/samples/openapi3/client/petstore/python-httpx2/requirements.txt b/samples/openapi3/client/petstore/python-httpx2/requirements.txt index ccf3d0aa899d..01be284f8452 100644 --- a/samples/openapi3/client/petstore/python-httpx2/requirements.txt +++ b/samples/openapi3/client/petstore/python-httpx2/requirements.txt @@ -3,4 +3,3 @@ httpx2 >= 2.13.0, < 3 pem >= 19.3.0 pycryptodome >= 3.9.0 pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/samples/openapi3/client/petstore/python-httpx2/setup.py b/samples/openapi3/client/petstore/python-httpx2/setup.py index def9367fbbd0..f90b73974e23 100644 --- a/samples/openapi3/client/petstore/python-httpx2/setup.py +++ b/samples/openapi3/client/petstore/python-httpx2/setup.py @@ -27,7 +27,6 @@ "pem >= 19.3.0", "pycryptodome >= 3.9.0", "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/another_fake_api.py index cf0ad78f8b88..c2165a0d8710 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/another_fake_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/default_api.py index 1d78bf1f8fe5..8f9d5d37643d 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/default_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from petstore_api.models.foo_get_default_response import FooGetDefaultResponse diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py index b7d2c36217b7..29316200b669 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py @@ -13,13 +13,11 @@ import json import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import date, datetime from pydantic import Field, StrictBool, StrictBytes, StrictFloat, StrictInt, StrictStr, field_validator -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from uuid import UUID from petstore_api.models.client import Client from petstore_api.models.enum_class import EnumClass diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_classname_tags123_api.py index 8faa294b368f..24522fe86884 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_classname_tags123_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/import_test_datetime_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/import_test_datetime_api.py index 1f7a61b06d09..cfebd7fce342 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/import_test_datetime_api.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/import_test_datetime_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import datetime diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/pet_api.py index 1ea2684a449d..28e26cd2f60e 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/pet_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, List, Optional, Tuple, Union from petstore_api.models.model_api_response import ModelApiResponse from petstore_api.models.pet import Pet diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/store_api.py index c579ee54e748..aefea0cb17ec 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/store_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictInt, StrictStr -from typing import Dict -from typing_extensions import Annotated +from typing import Annotated, Dict from petstore_api.models.order import Order from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/user_api.py index 321881637df4..e6eb77533f1f 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/user_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictStr -from typing import List -from typing_extensions import Annotated +from typing import Annotated, List from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/configuration.py index 7e9c9d177921..a1e9b4e9f8fa 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/configuration.py @@ -17,10 +17,9 @@ import multiprocessing import ssl import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union from urllib.parse import urlparse from urllib.request import getproxies -from typing_extensions import NotRequired, Self import urllib3 diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/exceptions.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/exceptions.py index 8e7fcf82d538..d978c12f2b67 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/exceptions.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/exceptions.py @@ -10,8 +10,7 @@ """ # noqa: E501 -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_any_type.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_any_type.py index 19db20137bc4..195345309ff3 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_any_type.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_any_type.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesAnyType(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_class.py index 2971822badc4..cefb7c8bc315 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.pet import Pet -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_object.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_object.py index d23fd87e51f3..41c2b4aea078 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_object.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_with_description_only.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_with_description_only.py index b1f42400b676..197648ee0a36 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_with_description_only.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/additional_properties_with_description_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesWithDescriptionOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/all_of_super_model.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/all_of_super_model.py index 86a856c01520..fedc3a058c7f 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/all_of_super_model.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/all_of_super_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfSuperModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/all_of_with_single_ref.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/all_of_with_single_ref.py index 371730978cfa..152dfda2699c 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/all_of_with_single_ref.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/all_of_with_single_ref.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.single_ref_type import SingleRefType -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfWithSingleRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/animal.py index 7c14179f558a..98f7de9ce8f9 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/animal.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/animal.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/any_of_color.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/any_of_color.py index f6d277e79498..4bcb6a751c30 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/any_of_color.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/any_of_color.py @@ -18,10 +18,8 @@ import pprint import re # noqa: F401 from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import List, Optional -from typing_extensions import Annotated -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Annotated, List, Optional +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/any_of_pig.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/any_of_pig.py index c949e136f415..ba66686bc9c8 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/any_of_pig.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/any_of_pig.py @@ -21,8 +21,7 @@ from typing import Optional from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_array_of_model.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_array_of_model.py index 1cefcccf761d..f8ff76d8b617 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_array_of_number_only.py index bf87ebab7ef8..207ac03d7ad2 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_map_model.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_map_model.py index 037ffbf014a3..f8ab838a714b 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_map_model.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_map_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfMapModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_number_only.py index c6c50aed2d41..a6ef11c4dc61 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_test.py index fe554557cff5..ec82407cd433 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_test.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/array_test.py @@ -18,11 +18,9 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.read_only_first import ReadOnlyFirst -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/base_discriminator.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/base_discriminator.py index ab0e261bb049..e6429648bfcc 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/base_discriminator.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/base_discriminator.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/basque_pig.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/basque_pig.py index 6517a2ec8a68..c537e2aa54e8 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/basque_pig.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/basque_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class BasquePig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/bathing.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/bathing.py index c4d595a498b8..cd404697fe97 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/bathing.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/bathing.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Bathing(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/capitalization.py index 1f38a7124a7f..3734c8375a4a 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/capitalization.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/capitalization.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Capitalization(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/cat.py index dfdf659272c0..72a428fb339f 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/cat.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/cat.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictBool from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Cat(Animal): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/category.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/category.py index 425e409c7adc..47cc0bb66a42 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/category.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/category.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Category(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/circular_all_of_ref.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/circular_all_of_ref.py index 3e025439e34a..84fd05b0818e 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/circular_reference_model.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/circular_reference_model.py index 4a46e13580af..7366d6d966f1 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/circular_reference_model.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/circular_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/class_model.py index 752706128969..25f8468ff06e 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/class_model.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/class_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ClassModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/client.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/client.py index cbbea6d33af4..dcef5426a688 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/client.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/client.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Client(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/color.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/color.py index bb740fb597d4..6d69a03f9b2e 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/color.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/color.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/creature.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/creature.py index 5f78af48d99f..c02b460fa020 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/creature.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/creature.py @@ -21,8 +21,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Union from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/creature_info.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/creature_info.py index ba91bd0874f3..a42e72f35297 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/creature_info.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/creature_info.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CreatureInfo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/danish_pig.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/danish_pig.py index 8450424cb228..39d944361da8 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/danish_pig.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/danish_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DanishPig(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/data_output_format.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/data_output_format.py index ee3df76c5169..af7b5d212fc2 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/data_output_format.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/data_output_format.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class DataOutputFormat(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/deprecated_object.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/deprecated_object.py index f310e64b7a83..8b8723cc7f8c 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/deprecated_object.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/deprecated_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DeprecatedObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/discriminator_all_of_sub.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/discriminator_all_of_sub.py index b9d520df11e3..57b046f07af9 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/discriminator_all_of_sub.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/discriminator_all_of_sub.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DiscriminatorAllOfSub(DiscriminatorAllOfSuper): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/discriminator_all_of_super.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/discriminator_all_of_super.py index d9aaad07ea17..bcb0ede447f8 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/discriminator_all_of_super.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/discriminator_all_of_super.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/dog.py index a5c869b8de82..aa3304ae75ea 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/dog.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/dog.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Dog(Animal): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/dummy_model.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/dummy_model.py index 9fdf057cdb63..e4029062e223 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/dummy_model.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/dummy_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DummyModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_arrays.py index 270f540ef1b6..243055f6b954 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_arrays.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_class.py index 1ba5af8036df..8d4effa9573a 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_class.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_class.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumClass(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_number_vendor_ext.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_number_vendor_ext.py index 5588de5c7043..a7e98fb3b521 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_number_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_number_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumNumberVendorExt(int, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_ref_with_default_value.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_ref_with_default_value.py index d35a7f9d426a..a5f2a5d77db1 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_ref_with_default_value.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_ref_with_default_value.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.data_output_format import DataOutputFormat -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumRefWithDefaultValue(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string1.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string1.py index 678b4e12661f..e14b8e930b6a 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string1.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string1.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString1(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string2.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string2.py index a959f554e0af..9f8f6c0fc0eb 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string2.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string2.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString2(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string_vendor_ext.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string_vendor_ext.py index 821812e9b088..a94b2a9afa35 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string_vendor_ext.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_string_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumStringVendorExt(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_test.py index b38efd78ef7e..31b433f394ae 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/enum_test.py @@ -25,8 +25,7 @@ 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 typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/feeding.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/feeding.py index 3efa9e0ede0e..4495b1b6cefe 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/feeding.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/feeding.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Feeding(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/file.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/file.py index b7670595acb2..90d47d8696d8 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/file.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/file.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class File(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/file_schema_test_class.py index a98f30c537bf..ae309f3a4242 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/file_schema_test_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FileSchemaTestClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/first_ref.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/first_ref.py index 50d561621b36..e1071200d147 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/first_ref.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/first_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FirstRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/foo.py index 2d15a0729446..77c7904a3457 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/foo.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/foo.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Foo(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/foo_get_default_response.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/foo_get_default_response.py index b8ab0cd0dfd1..e06057fae954 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/foo_get_default_response.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/foo_get_default_response.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.foo import Foo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FooGetDefaultResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/format_test.py index 1c0459f06e04..641c0bbfe5ce 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/format_test.py @@ -20,11 +20,9 @@ from datetime import date, datetime from decimal import Decimal from pydantic import BaseModel, ConfigDict, Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional, Tuple, Union from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FormatTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/has_only_read_only.py index 259ee97dcbab..ad36de6cc0de 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/has_only_read_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HasOnlyReadOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/header_arg.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/header_arg.py index a9c6fc72c56a..c2ddf095a353 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/header_arg.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/header_arg.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HeaderArg(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/health_check_result.py index e333321a7617..5d8cf2d883f7 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/health_check_result.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HealthCheckResult(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/hunting_dog.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/hunting_dog.py index 15c26d355520..938d85008ef8 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/hunting_dog.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/hunting_dog.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature import Creature from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HuntingDog(Creature): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/info.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/info.py index 71862c10b392..3f0e01cbab41 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/info.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/info.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Info(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/inner_dict_with_property.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/inner_dict_with_property.py index 093d1be68617..80a02e75930a 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/inner_dict_with_property.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/inner_dict_with_property.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InnerDictWithProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/input_all_of.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/input_all_of.py index 24c8f69713c6..ec9b4275e46a 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/input_all_of.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/input_all_of.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InputAllOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/int_or_string.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/int_or_string.py index f2a5a0a2d4a3..4343951a010d 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/int_or_string.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/int_or_string.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"] diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/known.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/known.py index 8d837239ac79..2fa9fa641665 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/known.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/known.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Known(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/list_class.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/list_class.py index 3c64d3024686..f2df35f012f4 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/list_class.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/list_class.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ListClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/map_of_array_of_model.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/map_of_array_of_model.py index 153c0bf17d77..27e96db49e83 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/map_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/map_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/map_test.py index 77569b9bf3b4..087cb0106dc8 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/map_test.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/mixed_properties_and_additional_properties_class.py index d2f2dd57c55f..852d10d8f3cb 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -22,8 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model200_response.py index a8f10880da53..33f6713b2b99 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model200_response.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model200_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Model200Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_api_response.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_api_response.py index 45960f5877ff..3c3753e2bb9b 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_api_response.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_api_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelApiResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_field.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_field.py index bf6560e93e13..8e0945eb8362 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_field.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_field.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelField(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_return.py index d564c896d7db..f7e1f66cb334 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_return.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/model_return.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelReturn(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/multi_arrays.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/multi_arrays.py index 3f3c3a2c686f..f76dc14460fa 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/multi_arrays.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/multi_arrays.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MultiArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/name.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/name.py index a5c21f36b2b9..238a93c7c3b4 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/name.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Name(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/nullable_class.py index 2504f4c359f5..c308c9997ffb 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/nullable_class.py @@ -20,8 +20,7 @@ from datetime import date, datetime from pydantic import BaseModel, ConfigDict, StrictBool, StrictFloat, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/nullable_property.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/nullable_property.py index 38c9b57b0652..3ee6ad10ab02 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/nullable_property.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/nullable_property.py @@ -18,10 +18,8 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated -from typing import Optional, Set -from typing_extensions import Self +from typing import Annotated, Any, ClassVar, Dict, List, Optional +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/number_only.py index e9c7ef6ddb2f..100c55ffa4f4 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/number_only.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/object_to_test_additional_properties.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/object_to_test_additional_properties.py index 0d8dd42a4b64..3d9a090900f2 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/object_to_test_additional_properties.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/object_to_test_additional_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectToTestAdditionalProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/object_with_deprecated_fields.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/object_with_deprecated_fields.py index 9b9ff8540e75..71c25e840ab9 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/object_with_deprecated_fields.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/object_with_deprecated_fields.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.deprecated_object import DeprecatedObject -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectWithDeprecatedFields(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/one_of_enum_string.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/one_of_enum_string.py index f180178737db..3125333dee19 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/one_of_enum_string.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/one_of_enum_string.py @@ -20,8 +20,7 @@ from petstore_api.models.enum_string1 import EnumString1 from petstore_api.models.enum_string2 import EnumString2 from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self ONEOFENUMSTRING_ONE_OF_SCHEMAS = ["EnumString1", "EnumString2"] diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/order.py index c7c9066c9cc2..809fff75b124 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/order.py @@ -20,8 +20,7 @@ from datetime import datetime from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Order(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/other.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/other.py index 665e41e78584..698ad82785dd 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/other.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/other.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Other(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_composite.py index 2272cc9f4f9c..3a8dce2b22c6 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_composite.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_composite.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictFloat, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterComposite(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum.py index ac48cc0dc4d8..1fed9a89a8be 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_default_value.py index 99d6fd5fc042..c9d2ddb32476 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_default_value.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumDefaultValue(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_integer.py index b771b7a61f55..b081e13fcd88 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_integer.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_integer.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumInteger(int, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_integer_default_value.py index 8df41b2bd320..3b4b3f98baf3 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_integer_default_value.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_enum_integer_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumIntegerDefaultValue(int, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_object_with_enum_property.py index dd6a05e25bff..ae38b5746fda 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/outer_object_with_enum_property.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.outer_enum import OuterEnum from petstore_api.models.outer_enum_integer import OuterEnumInteger -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterObjectWithEnumProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/parent.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/parent.py index 03ff626ab76f..3c067a69bd86 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/parent.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/parent.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Parent(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/parent_with_optional_dict.py index 3a1a564dffa3..5209acb74b6b 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/parent_with_optional_dict.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/parent_with_optional_dict.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ParentWithOptionalDict(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pet.py index fc36d1b7ed2e..eee18e0a9d20 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pet.py @@ -18,12 +18,10 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Pet(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pig.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pig.py index 8f9306304c66..88262a4923da 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pig.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pig.py @@ -20,8 +20,7 @@ from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pony_sizes.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pony_sizes.py index 4a231ca7cace..54a94ceb5062 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pony_sizes.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/pony_sizes.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.type import Type -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PonySizes(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/poop_cleaning.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/poop_cleaning.py index aed809a9fe0b..2a4aacce2e7e 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/poop_cleaning.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/poop_cleaning.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PoopCleaning(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/primitive_string.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/primitive_string.py index 1cee0bb8d9cf..d87dbf91b806 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/primitive_string.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/primitive_string.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PrimitiveString(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/property_map.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/property_map.py index 8ecaaa6c029c..8f6480ceca94 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/property_map.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/property_map.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyMap(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/property_name_collision.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/property_name_collision.py index 1ec220740305..debfb8761d89 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/property_name_collision.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/property_name_collision.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyNameCollision(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/read_only_first.py index debfe69300dc..5dea3b25c98e 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/read_only_first.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/read_only_first.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ReadOnlyFirst(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/second_circular_all_of_ref.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/second_circular_all_of_ref.py index 18346aee6fc9..f8655fd36d22 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/second_circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/second_circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondCircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/second_ref.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/second_ref.py index ef17a11429a9..a3a7d964d4d1 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/second_ref.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/second_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/self_reference_model.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/self_reference_model.py index bd49a84093b5..6b4419f8f26a 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/self_reference_model.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/self_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SelfReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/single_ref_type.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/single_ref_type.py index 91ab07e2535c..7e2f76951095 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/single_ref_type.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/single_ref_type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SingleRefType(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_character_enum.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_character_enum.py index 1d85fd148d4b..f2c71ebefd03 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_character_enum.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_character_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SpecialCharacterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_model_name.py index 528c09f6c18f..17acf7e2ffae 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_model_name.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_model_name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialModelName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_name.py index c667d1e9e4c6..a9d31803e46f 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/special_name.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialName(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tag.py index 7b636a76d02e..9e733202dff6 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tag.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tag.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tag(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tagged_union.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tagged_union.py index 2930dd983976..e437fbf51699 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tagged_union.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tagged_union.py @@ -20,8 +20,7 @@ from petstore_api.models.known import Known from petstore_api.models.other import Other from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TAGGEDUNION_ONE_OF_SCHEMAS = ["Known", "Other"] diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/task.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/task.py index b7a3153d1ea5..cd9582ec4c40 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/task.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/task.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List from uuid import UUID from petstore_api.models.task_activity import TaskActivity -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Task(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/task_activity.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/task_activity.py index cc1e1fc5a60f..f0541228a580 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/task_activity.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/task_activity.py @@ -21,8 +21,7 @@ from petstore_api.models.feeding import Feeding from petstore_api.models.poop_cleaning import PoopCleaning from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"] diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_enum.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_enum.py index 8eae227a84e9..b19bdb08cd26 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_enum.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_enum_with_default.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_enum_with_default.py index 9304d3ab8497..bf63e480a080 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_enum_with_default.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_enum_with_default.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnumWithDefault(str, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_error_responses_with_model400_response.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_error_responses_with_model400_response.py index 6c4ac684baeb..86cff653b246 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_error_responses_with_model400_response.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_error_responses_with_model400_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel400Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_error_responses_with_model404_response.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_error_responses_with_model404_response.py index 225e27ea0789..74c205302b75 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_error_responses_with_model404_response.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_error_responses_with_model404_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel404Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_inline_freeform_additional_properties_request.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_inline_freeform_additional_properties_request.py index 67f893c75448..9d71d50bded5 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_inline_freeform_additional_properties_request.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_inline_freeform_additional_properties_request.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestInlineFreeformAdditionalPropertiesRequest(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_model_with_enum_default.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_model_with_enum_default.py index 05d95daa9b22..4ee447ee99f9 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_model_with_enum_default.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_model_with_enum_default.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.test_enum import TestEnum from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestModelWithEnumDefault(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_object_for_multipart_requests_request_marker.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_object_for_multipart_requests_request_marker.py index 33bf3764d782..bba5824a3fa2 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_object_for_multipart_requests_request_marker.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/test_object_for_multipart_requests_request_marker.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestObjectForMultipartRequestsRequestMarker(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tiger.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tiger.py index 0962151b05ba..54fc7983d591 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tiger.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/tiger.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tiger(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/type.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/type.py index 35a847de894f..67d39ce69af6 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/type.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class Type(int, Enum): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py index 19262db97625..9ea3c8abd30b 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalModelListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py index 9e096d408cb6..480d87bf7284 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalStringListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/upload_file_with_additional_properties_request_object.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/upload_file_with_additional_properties_request_object.py index 1fd25f6d3f7b..896499ba16f7 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/upload_file_with_additional_properties_request_object.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/upload_file_with_additional_properties_request_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UploadFileWithAdditionalPropertiesRequestObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/user.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/user.py index d0c58815f3ce..ad5bfac705f5 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/user.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/user.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class User(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/uuid_with_pattern.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/uuid_with_pattern.py index 5dd5ec4932ed..9a882e9e366b 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/uuid_with_pattern.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/uuid_with_pattern.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, field_validator from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UuidWithPattern(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/with_nested_one_of.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/with_nested_one_of.py index cdd98e975f82..0cf85938c251 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/with_nested_one_of.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/with_nested_one_of.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.one_of_enum_string import OneOfEnumString from petstore_api.models.pig import Pig -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class WithNestedOneOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python-lazyImports/pyproject.toml b/samples/openapi3/client/petstore/python-lazyImports/pyproject.toml index 763ab84520b5..f0aa123dad60 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/pyproject.toml +++ b/samples/openapi3/client/petstore/python-lazyImports/pyproject.toml @@ -16,7 +16,6 @@ dependencies = [ "pem (>=19.3.0)", "pycryptodome (>=3.9.0)", "pydantic (>=2.11)", - "typing-extensions (>=4.7.1)", ] [project.urls] diff --git a/samples/openapi3/client/petstore/python-lazyImports/requirements.txt b/samples/openapi3/client/petstore/python-lazyImports/requirements.txt index 05db0e110efc..fbf7bf7fed58 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/requirements.txt +++ b/samples/openapi3/client/petstore/python-lazyImports/requirements.txt @@ -3,4 +3,3 @@ python_dateutil >= 2.8.2 pem >= 19.3.0 pycryptodome >= 3.9.0 pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/samples/openapi3/client/petstore/python-lazyImports/setup.py b/samples/openapi3/client/petstore/python-lazyImports/setup.py index 0e0385045013..c2b7d2b61562 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/setup.py +++ b/samples/openapi3/client/petstore/python-lazyImports/setup.py @@ -27,7 +27,6 @@ "pem >= 19.3.0", "pycryptodome >= 3.9.0", "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py index d75e24eca3a5..a5d76f6cad66 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py index 6abe92c60307..a86c77b6d041 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from petstore_api.models.foo_get_default_response import FooGetDefaultResponse diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py index 020ebbfa43ae..d2b2ebfd0e66 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py @@ -13,13 +13,11 @@ import json import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import date, datetime from pydantic import Field, StrictBool, StrictBytes, StrictFloat, StrictInt, StrictStr, field_validator -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from uuid import UUID from petstore_api.models.client import Client from petstore_api.models.enum_class import EnumClass diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags123_api.py index bdcd298ac5db..8cb9523eeb43 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags123_api.py @@ -12,11 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field -from typing_extensions import Annotated +from typing import Annotated from petstore_api.models.client import Client from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/import_test_datetime_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/import_test_datetime_api.py index 80426d1910ad..0d8cdb27e21a 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/import_test_datetime_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/import_test_datetime_api.py @@ -12,8 +12,7 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from datetime import datetime diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py index d34bd5c3c4e7..b4a1b2387c85 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, List, Optional, Tuple, Union from petstore_api.models.model_api_response import ModelApiResponse from petstore_api.models.pet import Pet diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py index f323e37fcdd5..b5e19f290623 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictInt, StrictStr -from typing import Dict -from typing_extensions import Annotated +from typing import Annotated, Dict from petstore_api.models.order import Order from petstore_api.api_client import ApiClient, RequestSerialized 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 28e2ca3c42e1..f80ee4fafc0e 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 @@ -12,12 +12,10 @@ import warnings from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt -from typing import Any, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictStr -from typing import List -from typing_extensions import Annotated +from typing import Annotated, List from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized diff --git a/samples/openapi3/client/petstore/python/petstore_api/configuration.py b/samples/openapi3/client/petstore/python/petstore_api/configuration.py index 3fdb5641b4d3..e2d0fcabbfa8 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python/petstore_api/configuration.py @@ -17,10 +17,9 @@ import multiprocessing import ssl import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union +from typing import Any, ClassVar, Dict, List, Literal, NotRequired, Optional, Self, TypedDict, Union from urllib.parse import urlparse from urllib.request import getproxies -from typing_extensions import NotRequired, Self import urllib3 diff --git a/samples/openapi3/client/petstore/python/petstore_api/exceptions.py b/samples/openapi3/client/petstore/python/petstore_api/exceptions.py index 8e7fcf82d538..d978c12f2b67 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/exceptions.py +++ b/samples/openapi3/client/petstore/python/petstore_api/exceptions.py @@ -10,8 +10,7 @@ """ # noqa: E501 -from typing import Any, Optional -from typing_extensions import Self +from typing import Any, Optional, Self class OpenApiException(Exception): """The base exception class for all OpenAPIExceptions""" diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_any_type.py b/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_any_type.py index 19db20137bc4..195345309ff3 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_any_type.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_any_type.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesAnyType(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_class.py index 2971822badc4..cefb7c8bc315 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.pet import Pet -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_object.py b/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_object.py index d23fd87e51f3..41c2b4aea078 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_object.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_with_description_only.py b/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_with_description_only.py index b1f42400b676..197648ee0a36 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_with_description_only.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_with_description_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AdditionalPropertiesWithDescriptionOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/all_of_super_model.py b/samples/openapi3/client/petstore/python/petstore_api/models/all_of_super_model.py index 86a856c01520..fedc3a058c7f 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/all_of_super_model.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/all_of_super_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfSuperModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/all_of_with_single_ref.py b/samples/openapi3/client/petstore/python/petstore_api/models/all_of_with_single_ref.py index 371730978cfa..152dfda2699c 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/all_of_with_single_ref.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/all_of_with_single_ref.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.single_ref_type import SingleRefType -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class AllOfWithSingleRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python/petstore_api/models/animal.py index ddd3d5b91735..b7f9e604a695 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/animal.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/animal.py @@ -21,8 +21,7 @@ from importlib import import_module from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, Union, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/any_of_color.py b/samples/openapi3/client/petstore/python/petstore_api/models/any_of_color.py index f6d277e79498..4bcb6a751c30 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/any_of_color.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/any_of_color.py @@ -18,10 +18,8 @@ import pprint import re # noqa: F401 from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import List, Optional -from typing_extensions import Annotated -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Annotated, List, Optional +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/any_of_pig.py b/samples/openapi3/client/petstore/python/petstore_api/models/any_of_pig.py index c949e136f415..ba66686bc9c8 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/any_of_pig.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/any_of_pig.py @@ -21,8 +21,7 @@ from typing import Optional from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig -from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict, Literal, Self from pydantic import Field ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_model.py b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_model.py index 1cefcccf761d..f8ff76d8b617 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py index bf87ebab7ef8..207ac03d7ad2 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_map_model.py b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_map_model.py index 037ffbf014a3..f8ab838a714b 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_map_model.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_map_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfMapModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_number_only.py index c6c50aed2d41..a6ef11c4dc61 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayOfNumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python/petstore_api/models/array_test.py index fe554557cff5..ec82407cd433 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/array_test.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/array_test.py @@ -18,11 +18,9 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.read_only_first import ReadOnlyFirst -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ArrayTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/base_discriminator.py b/samples/openapi3/client/petstore/python/petstore_api/models/base_discriminator.py index ab0e261bb049..e6429648bfcc 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/base_discriminator.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/base_discriminator.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/basque_pig.py b/samples/openapi3/client/petstore/python/petstore_api/models/basque_pig.py index 6517a2ec8a68..c537e2aa54e8 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/basque_pig.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/basque_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class BasquePig(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/bathing.py b/samples/openapi3/client/petstore/python/petstore_api/models/bathing.py index c4d595a498b8..cd404697fe97 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/bathing.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/bathing.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Bathing(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python/petstore_api/models/capitalization.py index 1f38a7124a7f..3734c8375a4a 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/capitalization.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/capitalization.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Capitalization(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python/petstore_api/models/cat.py index 4a4acd173910..5d7fc1751e39 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/cat.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/cat.py @@ -21,8 +21,7 @@ from pydantic import ConfigDict, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictBool, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Cat(Animal): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/category.py b/samples/openapi3/client/petstore/python/petstore_api/models/category.py index 425e409c7adc..47cc0bb66a42 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/category.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/category.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Category(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/circular_all_of_ref.py b/samples/openapi3/client/petstore/python/petstore_api/models/circular_all_of_ref.py index 3e025439e34a..84fd05b0818e 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/circular_reference_model.py b/samples/openapi3/client/petstore/python/petstore_api/models/circular_reference_model.py index 4a46e13580af..7366d6d966f1 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/circular_reference_model.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/circular_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CircularReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python/petstore_api/models/class_model.py index 752706128969..25f8468ff06e 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/class_model.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/class_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ClassModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/client.py b/samples/openapi3/client/petstore/python/petstore_api/models/client.py index cbbea6d33af4..dcef5426a688 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/client.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/client.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Client(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/color.py b/samples/openapi3/client/petstore/python/petstore_api/models/color.py index bb740fb597d4..6d69a03f9b2e 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/color.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/color.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"] diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/creature.py b/samples/openapi3/client/petstore/python/petstore_api/models/creature.py index 5f78af48d99f..c02b460fa020 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/creature.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/creature.py @@ -21,8 +21,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Union from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/creature_info.py b/samples/openapi3/client/petstore/python/petstore_api/models/creature_info.py index ba91bd0874f3..a42e72f35297 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/creature_info.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/creature_info.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class CreatureInfo(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/danish_pig.py b/samples/openapi3/client/petstore/python/petstore_api/models/danish_pig.py index 8450424cb228..39d944361da8 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/danish_pig.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/danish_pig.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DanishPig(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/data_output_format.py b/samples/openapi3/client/petstore/python/petstore_api/models/data_output_format.py index ee3df76c5169..af7b5d212fc2 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/data_output_format.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/data_output_format.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class DataOutputFormat(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/deprecated_object.py b/samples/openapi3/client/petstore/python/petstore_api/models/deprecated_object.py index f310e64b7a83..8b8723cc7f8c 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/deprecated_object.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/deprecated_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DeprecatedObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/discriminator_all_of_sub.py b/samples/openapi3/client/petstore/python/petstore_api/models/discriminator_all_of_sub.py index b9d520df11e3..57b046f07af9 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/discriminator_all_of_sub.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/discriminator_all_of_sub.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List from petstore_api.models.discriminator_all_of_super import DiscriminatorAllOfSuper -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DiscriminatorAllOfSub(DiscriminatorAllOfSuper): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/discriminator_all_of_super.py b/samples/openapi3/client/petstore/python/petstore_api/models/discriminator_all_of_super.py index d9aaad07ea17..bcb0ede447f8 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/discriminator_all_of_super.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/discriminator_all_of_super.py @@ -20,8 +20,7 @@ from importlib import import_module from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Union -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python/petstore_api/models/dog.py index e905d72a9fef..a39822032d58 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/dog.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/dog.py @@ -21,8 +21,7 @@ from pydantic import ConfigDict, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Dog(Animal): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/dummy_model.py b/samples/openapi3/client/petstore/python/petstore_api/models/dummy_model.py index 9fdf057cdb63..e4029062e223 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/dummy_model.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/dummy_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class DummyModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_arrays.py index 270f540ef1b6..243055f6b954 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_arrays.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_class.py index 1ba5af8036df..8d4effa9573a 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_class.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_class.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumClass(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_number_vendor_ext.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_number_vendor_ext.py index 5588de5c7043..a7e98fb3b521 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_number_vendor_ext.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_number_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumNumberVendorExt(int, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_ref_with_default_value.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_ref_with_default_value.py index d35a7f9d426a..a5f2a5d77db1 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_ref_with_default_value.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_ref_with_default_value.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.data_output_format import DataOutputFormat -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumRefWithDefaultValue(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_string1.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_string1.py index 678b4e12661f..e14b8e930b6a 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_string1.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_string1.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString1(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_string2.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_string2.py index a959f554e0af..9f8f6c0fc0eb 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_string2.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_string2.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumString2(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_string_vendor_ext.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_string_vendor_ext.py index 821812e9b088..a94b2a9afa35 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_string_vendor_ext.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_string_vendor_ext.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumStringVendorExt(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py index b38efd78ef7e..31b433f394ae 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py @@ -25,8 +25,7 @@ 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 typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class EnumTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/feeding.py b/samples/openapi3/client/petstore/python/petstore_api/models/feeding.py index 3efa9e0ede0e..4495b1b6cefe 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/feeding.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/feeding.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Feeding(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/file.py b/samples/openapi3/client/petstore/python/petstore_api/models/file.py index b7670595acb2..90d47d8696d8 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/file.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/file.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class File(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python/petstore_api/models/file_schema_test_class.py index a98f30c537bf..ae309f3a4242 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/file_schema_test_class.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FileSchemaTestClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/first_ref.py b/samples/openapi3/client/petstore/python/petstore_api/models/first_ref.py index 50d561621b36..e1071200d147 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/first_ref.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/first_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FirstRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python/petstore_api/models/foo.py index 2d15a0729446..77c7904a3457 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/foo.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/foo.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Foo(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/foo_get_default_response.py b/samples/openapi3/client/petstore/python/petstore_api/models/foo_get_default_response.py index b8ab0cd0dfd1..e06057fae954 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/foo_get_default_response.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/foo_get_default_response.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.foo import Foo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FooGetDefaultResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python/petstore_api/models/format_test.py index 1c0459f06e04..641c0bbfe5ce 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/format_test.py @@ -20,11 +20,9 @@ from datetime import date, datetime from decimal import Decimal from pydantic import BaseModel, ConfigDict, Field, StrictBytes, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional, Tuple, Union from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class FormatTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python/petstore_api/models/has_only_read_only.py index 259ee97dcbab..ad36de6cc0de 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/has_only_read_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HasOnlyReadOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/header_arg.py b/samples/openapi3/client/petstore/python/petstore_api/models/header_arg.py index a9c6fc72c56a..c2ddf095a353 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/header_arg.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/header_arg.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HeaderArg(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python/petstore_api/models/health_check_result.py index e333321a7617..5d8cf2d883f7 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/health_check_result.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HealthCheckResult(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/hunting_dog.py b/samples/openapi3/client/petstore/python/petstore_api/models/hunting_dog.py index 15c26d355520..938d85008ef8 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/hunting_dog.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/hunting_dog.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature import Creature from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class HuntingDog(Creature): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/info.py b/samples/openapi3/client/petstore/python/petstore_api/models/info.py index 71862c10b392..3f0e01cbab41 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/info.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/info.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Info(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/inner_dict_with_property.py b/samples/openapi3/client/petstore/python/petstore_api/models/inner_dict_with_property.py index 093d1be68617..80a02e75930a 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/inner_dict_with_property.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/inner_dict_with_property.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InnerDictWithProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/input_all_of.py b/samples/openapi3/client/petstore/python/petstore_api/models/input_all_of.py index 24c8f69713c6..ec9b4275e46a 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/input_all_of.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/input_all_of.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class InputAllOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/int_or_string.py b/samples/openapi3/client/petstore/python/petstore_api/models/int_or_string.py index f2a5a0a2d4a3..4343951a010d 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/int_or_string.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/int_or_string.py @@ -16,11 +16,9 @@ import json import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"] diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/known.py b/samples/openapi3/client/petstore/python/petstore_api/models/known.py index 8d837239ac79..2fa9fa641665 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/known.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/known.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Known(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/list_class.py b/samples/openapi3/client/petstore/python/petstore_api/models/list_class.py index 3c64d3024686..f2df35f012f4 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/list_class.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/list_class.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ListClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/map_of_array_of_model.py b/samples/openapi3/client/petstore/python/petstore_api/models/map_of_array_of_model.py index 153c0bf17d77..27e96db49e83 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/map_of_array_of_model.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/map_of_array_of_model.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapOfArrayOfModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python/petstore_api/models/map_test.py index 77569b9bf3b4..087cb0106dc8 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/map_test.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MapTest(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py index d2f2dd57c55f..852d10d8f3cb 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -22,8 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID from petstore_api.models.animal import Animal -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python/petstore_api/models/model200_response.py index a8f10880da53..33f6713b2b99 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/model200_response.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/model200_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Model200Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/model_api_response.py b/samples/openapi3/client/petstore/python/petstore_api/models/model_api_response.py index 45960f5877ff..3c3753e2bb9b 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/model_api_response.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/model_api_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelApiResponse(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/model_field.py b/samples/openapi3/client/petstore/python/petstore_api/models/model_field.py index bf6560e93e13..8e0945eb8362 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/model_field.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/model_field.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ModelField(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python/petstore_api/models/model_return.py index 21357c915603..ccf16cc6b6f3 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/model_return.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/model_return.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictInt, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/multi_arrays.py b/samples/openapi3/client/petstore/python/petstore_api/models/multi_arrays.py index 3f3c3a2c686f..f76dc14460fa 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/multi_arrays.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/multi_arrays.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.file import File from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class MultiArrays(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/name.py b/samples/openapi3/client/petstore/python/petstore_api/models/name.py index a5c21f36b2b9..238a93c7c3b4 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/name.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Name(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python/petstore_api/models/nullable_class.py index 2504f4c359f5..c308c9997ffb 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/nullable_class.py @@ -20,8 +20,7 @@ from datetime import date, datetime from pydantic import BaseModel, ConfigDict, StrictBool, StrictFloat, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableClass(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/nullable_property.py b/samples/openapi3/client/petstore/python/petstore_api/models/nullable_property.py index 38c9b57b0652..3ee6ad10ab02 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/nullable_property.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/nullable_property.py @@ -18,10 +18,8 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated -from typing import Optional, Set -from typing_extensions import Self +from typing import Annotated, Any, ClassVar, Dict, List, Optional +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NullableProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python/petstore_api/models/number_only.py index e9c7ef6ddb2f..100c55ffa4f4 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/number_only.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/number_only.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class NumberOnly(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/object_to_test_additional_properties.py b/samples/openapi3/client/petstore/python/petstore_api/models/object_to_test_additional_properties.py index 0d8dd42a4b64..3d9a090900f2 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/object_to_test_additional_properties.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/object_to_test_additional_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectToTestAdditionalProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/object_with_deprecated_fields.py b/samples/openapi3/client/petstore/python/petstore_api/models/object_with_deprecated_fields.py index 9b9ff8540e75..71c25e840ab9 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/object_with_deprecated_fields.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/object_with_deprecated_fields.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.deprecated_object import DeprecatedObject -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ObjectWithDeprecatedFields(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/one_of_enum_string.py b/samples/openapi3/client/petstore/python/petstore_api/models/one_of_enum_string.py index f180178737db..3125333dee19 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/one_of_enum_string.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/one_of_enum_string.py @@ -20,8 +20,7 @@ from petstore_api.models.enum_string1 import EnumString1 from petstore_api.models.enum_string2 import EnumString2 from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self ONEOFENUMSTRING_ONE_OF_SCHEMAS = ["EnumString1", "EnumString2"] diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/order.py b/samples/openapi3/client/petstore/python/petstore_api/models/order.py index fa287642149c..b157ff9bad30 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/order.py @@ -21,8 +21,7 @@ from datetime import datetime from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictBool, StrictInt, StrictStr, field_validator, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/other.py b/samples/openapi3/client/petstore/python/petstore_api/models/other.py index 665e41e78584..698ad82785dd 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/other.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/other.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Other(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python/petstore_api/models/outer_composite.py index 2272cc9f4f9c..3a8dce2b22c6 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/outer_composite.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/outer_composite.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictBool, StrictFloat, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterComposite(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum.py index ac48cc0dc4d8..1fed9a89a8be 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_default_value.py index 99d6fd5fc042..c9d2ddb32476 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_default_value.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumDefaultValue(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_integer.py index b771b7a61f55..b081e13fcd88 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_integer.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_integer.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumInteger(int, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_integer_default_value.py index 8df41b2bd320..3b4b3f98baf3 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_integer_default_value.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_integer_default_value.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class OuterEnumIntegerDefaultValue(int, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python/petstore_api/models/outer_object_with_enum_property.py index dd6a05e25bff..ae38b5746fda 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/outer_object_with_enum_property.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.outer_enum import OuterEnum from petstore_api.models.outer_enum_integer import OuterEnumInteger -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class OuterObjectWithEnumProperty(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/parent.py b/samples/openapi3/client/petstore/python/petstore_api/models/parent.py index 03ff626ab76f..3c067a69bd86 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/parent.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/parent.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Parent(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python/petstore_api/models/parent_with_optional_dict.py index 3a1a564dffa3..5209acb74b6b 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/parent_with_optional_dict.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/parent_with_optional_dict.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.inner_dict_with_property import InnerDictWithProperty -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ParentWithOptionalDict(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python/petstore_api/models/pet.py index fc36d1b7ed2e..eee18e0a9d20 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/pet.py @@ -18,12 +18,10 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional from petstore_api.models.category import Category from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Pet(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/pig.py b/samples/openapi3/client/petstore/python/petstore_api/models/pig.py index 8f9306304c66..88262a4923da 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/pig.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/pig.py @@ -20,8 +20,7 @@ from petstore_api.models.basque_pig import BasquePig from petstore_api.models.danish_pig import DanishPig from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"] diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/pony_sizes.py b/samples/openapi3/client/petstore/python/petstore_api/models/pony_sizes.py index 4a231ca7cace..54a94ceb5062 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/pony_sizes.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/pony_sizes.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.type import Type -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PonySizes(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/poop_cleaning.py b/samples/openapi3/client/petstore/python/petstore_api/models/poop_cleaning.py index aed809a9fe0b..2a4aacce2e7e 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/poop_cleaning.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/poop_cleaning.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PoopCleaning(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/primitive_string.py b/samples/openapi3/client/petstore/python/petstore_api/models/primitive_string.py index 1cee0bb8d9cf..d87dbf91b806 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/primitive_string.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/primitive_string.py @@ -20,8 +20,7 @@ from pydantic import ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.base_discriminator import BaseDiscriminator -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PrimitiveString(BaseDiscriminator): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/property_map.py b/samples/openapi3/client/petstore/python/petstore_api/models/property_map.py index 8ecaaa6c029c..8f6480ceca94 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/property_map.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/property_map.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.tag import Tag -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyMap(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/property_name_collision.py b/samples/openapi3/client/petstore/python/petstore_api/models/property_name_collision.py index 1ec220740305..debfb8761d89 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/property_name_collision.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/property_name_collision.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class PropertyNameCollision(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python/petstore_api/models/read_only_first.py index debfe69300dc..5dea3b25c98e 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/read_only_first.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/read_only_first.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class ReadOnlyFirst(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/second_circular_all_of_ref.py b/samples/openapi3/client/petstore/python/petstore_api/models/second_circular_all_of_ref.py index 18346aee6fc9..f8655fd36d22 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/second_circular_all_of_ref.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/second_circular_all_of_ref.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SecondCircularAllOfRef(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/second_ref.py b/samples/openapi3/client/petstore/python/petstore_api/models/second_ref.py index b3bc1c52aa09..2fca94b79452 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/second_ref.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/second_ref.py @@ -20,8 +20,7 @@ from collections.abc import Mapping as _Mapping from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictStr, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/self_reference_model.py b/samples/openapi3/client/petstore/python/petstore_api/models/self_reference_model.py index bd49a84093b5..6b4419f8f26a 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/self_reference_model.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/self_reference_model.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SelfReferenceModel(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/single_ref_type.py b/samples/openapi3/client/petstore/python/petstore_api/models/single_ref_type.py index 91ab07e2535c..7e2f76951095 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/single_ref_type.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/single_ref_type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SingleRefType(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/special_character_enum.py b/samples/openapi3/client/petstore/python/petstore_api/models/special_character_enum.py index 1d85fd148d4b..f2c71ebefd03 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/special_character_enum.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/special_character_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class SpecialCharacterEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python/petstore_api/models/special_model_name.py index 528c09f6c18f..17acf7e2ffae 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/special_model_name.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/special_model_name.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class SpecialModelName(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python/petstore_api/models/special_name.py index 457b971b8c82..b613ba53c269 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/special_name.py @@ -21,8 +21,7 @@ from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ModelWrapValidatorHandler as _ModelWrapValidatorHandler, StrictInt, StrictStr, field_validator, model_validator as _model_validator from typing import Any, ClassVar, Dict, List, Optional, cast as _cast from petstore_api.models.category import Category -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python from typing import TYPE_CHECKING diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python/petstore_api/models/tag.py index 7b636a76d02e..9e733202dff6 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/tag.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/tag.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tag(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/tagged_union.py b/samples/openapi3/client/petstore/python/petstore_api/models/tagged_union.py index 2930dd983976..e437fbf51699 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/tagged_union.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/tagged_union.py @@ -20,8 +20,7 @@ from petstore_api.models.known import Known from petstore_api.models.other import Other from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TAGGEDUNION_ONE_OF_SCHEMAS = ["Known", "Other"] diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/task.py b/samples/openapi3/client/petstore/python/petstore_api/models/task.py index b7a3153d1ea5..cd9582ec4c40 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/task.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/task.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List from uuid import UUID from petstore_api.models.task_activity import TaskActivity -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Task(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/task_activity.py b/samples/openapi3/client/petstore/python/petstore_api/models/task_activity.py index cc1e1fc5a60f..f0541228a580 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/task_activity.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/task_activity.py @@ -21,8 +21,7 @@ from petstore_api.models.feeding import Feeding from petstore_api.models.poop_cleaning import PoopCleaning from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self +from typing import Union, List, Set, Optional, Dict, Literal, Self TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"] diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/test_enum.py b/samples/openapi3/client/petstore/python/petstore_api/models/test_enum.py index 8eae227a84e9..b19bdb08cd26 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/test_enum.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/test_enum.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnum(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/test_enum_with_default.py b/samples/openapi3/client/petstore/python/petstore_api/models/test_enum_with_default.py index 9304d3ab8497..bf63e480a080 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/test_enum_with_default.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/test_enum_with_default.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class TestEnumWithDefault(str, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/test_error_responses_with_model400_response.py b/samples/openapi3/client/petstore/python/petstore_api/models/test_error_responses_with_model400_response.py index 6c4ac684baeb..86cff653b246 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/test_error_responses_with_model400_response.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/test_error_responses_with_model400_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel400Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/test_error_responses_with_model404_response.py b/samples/openapi3/client/petstore/python/petstore_api/models/test_error_responses_with_model404_response.py index 225e27ea0789..74c205302b75 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/test_error_responses_with_model404_response.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/test_error_responses_with_model404_response.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestErrorResponsesWithModel404Response(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/test_inline_freeform_additional_properties_request.py b/samples/openapi3/client/petstore/python/petstore_api/models/test_inline_freeform_additional_properties_request.py index 67f893c75448..9d71d50bded5 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/test_inline_freeform_additional_properties_request.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/test_inline_freeform_additional_properties_request.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestInlineFreeformAdditionalPropertiesRequest(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/test_model_with_enum_default.py b/samples/openapi3/client/petstore/python/petstore_api/models/test_model_with_enum_default.py index 05d95daa9b22..4ee447ee99f9 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/test_model_with_enum_default.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/test_model_with_enum_default.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.test_enum import TestEnum from petstore_api.models.test_enum_with_default import TestEnumWithDefault -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestModelWithEnumDefault(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/test_object_for_multipart_requests_request_marker.py b/samples/openapi3/client/petstore/python/petstore_api/models/test_object_for_multipart_requests_request_marker.py index 33bf3764d782..bba5824a3fa2 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/test_object_for_multipart_requests_request_marker.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/test_object_for_multipart_requests_request_marker.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class TestObjectForMultipartRequestsRequestMarker(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/tiger.py b/samples/openapi3/client/petstore/python/petstore_api/models/tiger.py index 0962151b05ba..54fc7983d591 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/tiger.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/tiger.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class Tiger(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/type.py b/samples/openapi3/client/petstore/python/petstore_api/models/type.py index 35a847de894f..67d39ce69af6 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/type.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/type.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class Type(int, Enum): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py b/samples/openapi3/client/petstore/python/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py index 19262db97625..9ea3c8abd30b 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.creature_info import CreatureInfo -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalModelListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py b/samples/openapi3/client/petstore/python/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py index 9e096d408cb6..480d87bf7284 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/unnamed_dict_with_additional_string_list_properties.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UnnamedDictWithAdditionalStringListProperties(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/upload_file_with_additional_properties_request_object.py b/samples/openapi3/client/petstore/python/petstore_api/models/upload_file_with_additional_properties_request_object.py index 1fd25f6d3f7b..896499ba16f7 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/upload_file_with_additional_properties_request_object.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/upload_file_with_additional_properties_request_object.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UploadFileWithAdditionalPropertiesRequestObject(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/user.py b/samples/openapi3/client/petstore/python/petstore_api/models/user.py index d0c58815f3ce..ad5bfac705f5 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/user.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/user.py @@ -19,8 +19,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class User(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/uuid_with_pattern.py b/samples/openapi3/client/petstore/python/petstore_api/models/uuid_with_pattern.py index 5dd5ec4932ed..9a882e9e366b 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/uuid_with_pattern.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/uuid_with_pattern.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, ConfigDict, field_validator from typing import Any, ClassVar, Dict, List, Optional from uuid import UUID -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class UuidWithPattern(BaseModel): diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/with_nested_one_of.py b/samples/openapi3/client/petstore/python/petstore_api/models/with_nested_one_of.py index cdd98e975f82..0cf85938c251 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/with_nested_one_of.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/with_nested_one_of.py @@ -21,8 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional from petstore_api.models.one_of_enum_string import OneOfEnumString from petstore_api.models.pig import Pig -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self from pydantic_core import to_jsonable_python class WithNestedOneOf(BaseModel): diff --git a/samples/openapi3/client/petstore/python/pyproject.toml b/samples/openapi3/client/petstore/python/pyproject.toml index 763ab84520b5..f0aa123dad60 100644 --- a/samples/openapi3/client/petstore/python/pyproject.toml +++ b/samples/openapi3/client/petstore/python/pyproject.toml @@ -16,7 +16,6 @@ dependencies = [ "pem (>=19.3.0)", "pycryptodome (>=3.9.0)", "pydantic (>=2.11)", - "typing-extensions (>=4.7.1)", ] [project.urls] diff --git a/samples/openapi3/client/petstore/python/requirements.txt b/samples/openapi3/client/petstore/python/requirements.txt index 05db0e110efc..fbf7bf7fed58 100755 --- a/samples/openapi3/client/petstore/python/requirements.txt +++ b/samples/openapi3/client/petstore/python/requirements.txt @@ -3,4 +3,3 @@ python_dateutil >= 2.8.2 pem >= 19.3.0 pycryptodome >= 3.9.0 pydantic >= 2.11 -typing-extensions >= 4.7.1 diff --git a/samples/openapi3/client/petstore/python/setup.py b/samples/openapi3/client/petstore/python/setup.py index 0e0385045013..c2b7d2b61562 100755 --- a/samples/openapi3/client/petstore/python/setup.py +++ b/samples/openapi3/client/petstore/python/setup.py @@ -27,7 +27,6 @@ "pem >= 19.3.0", "pycryptodome >= 3.9.0", "pydantic >= 2.11", - "typing-extensions >= 4.7.1", ] setup( diff --git a/samples/openapi3/client/petstore/python/tests/test_model.py b/samples/openapi3/client/petstore/python/tests/test_model.py index 9e14a07ab247..9502ff60f971 100644 --- a/samples/openapi3/client/petstore/python/tests/test_model.py +++ b/samples/openapi3/client/petstore/python/tests/test_model.py @@ -16,7 +16,7 @@ import petstore_api from petstore_api import InnerDictWithProperty -from typing_extensions import assert_type +from typing import assert_type class ModelTests(unittest.TestCase): diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/apis/fake_api.py b/samples/server/petstore/python-fastapi/src/openapi_server/apis/fake_api.py index 175746812f3d..e8e03220362f 100644 --- a/samples/server/petstore/python-fastapi/src/openapi_server/apis/fake_api.py +++ b/samples/server/petstore/python-fastapi/src/openapi_server/apis/fake_api.py @@ -23,8 +23,7 @@ ) from pydantic import Field -from typing import Any, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, Optional router = APIRouter() diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/apis/fake_api_base.py b/samples/server/petstore/python-fastapi/src/openapi_server/apis/fake_api_base.py index e8343c5d1330..62bbe0dbe401 100644 --- a/samples/server/petstore/python-fastapi/src/openapi_server/apis/fake_api_base.py +++ b/samples/server/petstore/python-fastapi/src/openapi_server/apis/fake_api_base.py @@ -3,8 +3,7 @@ from typing import ClassVar, Dict, List, Tuple # noqa: F401 from pydantic import Field -from typing import Any, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, Optional class BaseFakeApi: diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/apis/pet_api.py b/samples/server/petstore/python-fastapi/src/openapi_server/apis/pet_api.py index 76200809cc55..8da828205446 100644 --- a/samples/server/petstore/python-fastapi/src/openapi_server/apis/pet_api.py +++ b/samples/server/petstore/python-fastapi/src/openapi_server/apis/pet_api.py @@ -23,8 +23,7 @@ ) from pydantic import Field, StrictBytes, StrictStr, field_validator -from typing import Any, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional, Tuple, Union from openapi_server.models.api_response import ApiResponse from openapi_server.models.pet import Pet from fastapi import File, UploadFile diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/apis/pet_api_base.py b/samples/server/petstore/python-fastapi/src/openapi_server/apis/pet_api_base.py index dd8780dc2416..eef98caffbd8 100644 --- a/samples/server/petstore/python-fastapi/src/openapi_server/apis/pet_api_base.py +++ b/samples/server/petstore/python-fastapi/src/openapi_server/apis/pet_api_base.py @@ -3,8 +3,7 @@ from typing import ClassVar, Dict, List, Tuple # noqa: F401 from pydantic import Field, StrictBytes, StrictStr, field_validator -from typing import Any, List, Optional, Tuple, Union -from typing_extensions import Annotated +from typing import Annotated, Any, List, Optional, Tuple, Union from openapi_server.models.api_response import ApiResponse from openapi_server.models.pet import Pet from fastapi import File, UploadFile diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api.py b/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api.py index 414e5625af96..9bdf545205f6 100644 --- a/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api.py +++ b/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api.py @@ -23,8 +23,7 @@ ) from pydantic import Field, StrictInt -from typing import Any, Dict -from typing_extensions import Annotated +from typing import Annotated, Any, Dict from openapi_server.models.order import Order from openapi_server.models.extra_models import TokenModel # noqa: F401 from openapi_server.security_api import get_token_api_key diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api_base.py b/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api_base.py index 76d310a4997c..3060f846fc61 100644 --- a/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api_base.py +++ b/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api_base.py @@ -3,8 +3,7 @@ from typing import ClassVar, Dict, List, Tuple # noqa: F401 from pydantic import Field, StrictInt -from typing import Any, Dict -from typing_extensions import Annotated +from typing import Annotated, Any, Dict from openapi_server.models.order import Order from openapi_server.security_api import get_token_api_key diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/apis/user_api.py b/samples/server/petstore/python-fastapi/src/openapi_server/apis/user_api.py index d6466608634a..4acda03f42a2 100644 --- a/samples/server/petstore/python-fastapi/src/openapi_server/apis/user_api.py +++ b/samples/server/petstore/python-fastapi/src/openapi_server/apis/user_api.py @@ -23,8 +23,7 @@ ) from pydantic import Field, StrictStr, field_validator -from typing import Any, List -from typing_extensions import Annotated +from typing import Annotated, Any, List from openapi_server.models.user import User from openapi_server.models.extra_models import TokenModel # noqa: F401 from openapi_server.security_api import get_token_api_key diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/apis/user_api_base.py b/samples/server/petstore/python-fastapi/src/openapi_server/apis/user_api_base.py index 9668b337d089..3117b0be279b 100644 --- a/samples/server/petstore/python-fastapi/src/openapi_server/apis/user_api_base.py +++ b/samples/server/petstore/python-fastapi/src/openapi_server/apis/user_api_base.py @@ -3,8 +3,7 @@ from typing import ClassVar, Dict, List, Tuple # noqa: F401 from pydantic import Field, StrictStr, field_validator -from typing import Any, List -from typing_extensions import Annotated +from typing import Annotated, Any, List from openapi_server.models.user import User from openapi_server.security_api import get_token_api_key diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/models/category.py b/samples/server/petstore/python-fastapi/src/openapi_server/models/category.py index 48b689cba886..77d004214edb 100644 --- a/samples/server/petstore/python-fastapi/src/openapi_server/models/category.py +++ b/samples/server/petstore/python-fastapi/src/openapi_server/models/category.py @@ -21,8 +21,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, field_validator -from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Annotated +from typing import Annotated, Any, ClassVar, Dict, List, Optional try: from typing import Self except ImportError: From 7d8a864a612d77e29fc9e0bc62d9a92fa32ceacf Mon Sep 17 00:00:00 2001 From: timonrieger Date: Sat, 14 Nov 2026 20:41:31 +0100 Subject: [PATCH 2/2] [python] import Self from typing in stale samples --- ...e_form_explode_true_array_integer_query_object_parameter.py | 3 +-- ...e_form_explode_true_array_integer_query_object_parameter.py | 3 +-- .../petstore/python/petstore_api/models/enum_serialization.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_integer_query_object_parameter.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_integer_query_object_parameter.py index 52e50d5a5612..6064086dfb7d 100644 --- a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_integer_query_object_parameter.py +++ b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_integer_query_object_parameter.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self class TestQueryStyleFormExplodeTrueArrayIntegerQueryObjectParameter(BaseModel): """ diff --git a/samples/client/echo_api/python/openapi_client/models/test_query_style_form_explode_true_array_integer_query_object_parameter.py b/samples/client/echo_api/python/openapi_client/models/test_query_style_form_explode_true_array_integer_query_object_parameter.py index 93c6f0c1216d..8b451b365114 100644 --- a/samples/client/echo_api/python/openapi_client/models/test_query_style_form_explode_true_array_integer_query_object_parameter.py +++ b/samples/client/echo_api/python/openapi_client/models/test_query_style_form_explode_true_array_integer_query_object_parameter.py @@ -20,8 +20,7 @@ from pydantic import BaseModel, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from typing import Optional, Set -from typing_extensions import Self +from typing import Optional, Set, Self class TestQueryStyleFormExplodeTrueArrayIntegerQueryObjectParameter(BaseModel): """ diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_serialization.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_serialization.py index b7177b7f380a..7b2d61978cfc 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_serialization.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_serialization.py @@ -15,7 +15,7 @@ from __future__ import annotations import json from enum import Enum -from typing_extensions import Self +from typing import Self class EnumSerialization(int, Enum):